Merge pull request #14 from tyru/customizable-and-u3000-support

Make highlight customizable and U+3000 character support
This commit is contained in:
Scott Bronson
2016-03-13 01:28:37 -08:00

View File

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