m-vim_plugins/vim-trailing-whitespace
1
0
Fork 0
mirror of https://github.com/bronson/vim-trailing-whitespace.git synced 2025-11-08 11:33:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Make ShouldMatchWhitespace() script-local function"

Browse Source 
This reverts commit 1b7f4dcfdc.

Sounds like at least one other plugin is using ShouldMatchWhitespace.

Conflicts:
	plugin/trailing-whitespace.vim
This commit is contained in:
Scott Bronson
2016-03-27 21:33:34 -07:00
parent 8328b966ab
commit 733fb64337
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/trailing-whitespace.vim
View File

@@ -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(".")