From 733fb64337b6da4a51c85a43450cd620d8b617b5 Mon Sep 17 00:00:00 2001
From: Scott Bronson <brons_git@rinspin.com>
Date: Sun, 27 Mar 2016 21:33:34 -0700
Subject: [PATCH] Revert "Make ShouldMatchWhitespace() script-local function"

This reverts commit 1b7f4dcfdc776cb3260e27a77bbe630c37268e29.

Sounds like at least one other plugin is using ShouldMatchWhitespace.

Conflicts:
	plugin/trailing-whitespace.vim
---
 plugin/trailing-whitespace.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugin/trailing-whitespace.vim b/plugin/trailing-whitespace.vim
index 412a36f..091797f 100644
--- a/plugin/trailing-whitespace.vim
+++ b/plugin/trailing-whitespace.vim
@@ -5,7 +5,7 @@ if !exists('g:extra_whitespace_ignored_filetypes')
     let g:extra_whitespace_ignored_filetypes = []
 endif
 
-function! s:ShouldMatchWhitespace()
+function! ShouldMatchWhitespace()
     for ft in g:extra_whitespace_ignored_filetypes
         if ft ==# &filetype | return 0 | endif
     endfor
@@ -15,11 +15,11 @@ endfunction
 " Highlight EOL whitespace, http://vim.wikia.com/wiki/Highlight_unwanted_spaces
 highlight default ExtraWhitespace ctermbg=darkred guibg=#382424
 autocmd ColorScheme * highlight default ExtraWhitespace ctermbg=red guibg=red
-autocmd BufRead,BufNew * if s:ShouldMatchWhitespace() | match ExtraWhitespace /\\\@<![\u3000[:space:]]\+$/ | else | match ExtraWhitespace /^^/ | endif
+autocmd BufRead,BufNew * if ShouldMatchWhitespace() | match ExtraWhitespace /\\\@<![\u3000[:space:]]\+$/ | else | match ExtraWhitespace /^^/ | endif
 
 " The above flashes annoyingly while typing, be calmer in insert mode
-autocmd InsertLeave * if s:ShouldMatchWhitespace() | match ExtraWhitespace /\\\@<![\u3000[:space:]]\+$/ | endif
-autocmd InsertEnter * if s:ShouldMatchWhitespace() | match ExtraWhitespace /\\\@<![\u3000[:space:]]\+\%#\@<!$/ | endif
+autocmd InsertLeave * if ShouldMatchWhitespace() | match ExtraWhitespace /\\\@<![\u3000[:space:]]\+$/ | endif
+autocmd InsertEnter * if ShouldMatchWhitespace() | match ExtraWhitespace /\\\@<![\u3000[:space:]]\+\%#\@<!$/ | endif
 
 function! s:FixWhitespace(line1,line2)
     let l:save_cursor = getpos(".")