mirror of
https://github.com/bronson/vim-trailing-whitespace.git
synced 2025-11-08 11:33:54 -05:00
Merge remote-tracking branch 'hugomg/master'
Conflicts: plugin/trailing-whitespace.vim
This commit is contained in:
@@ -15,15 +15,15 @@ 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 default ExtraWhitespace ctermbg=red guibg=red
|
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 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 s:ShouldMatchWhitespace() | match ExtraWhitespace /[\u3000[:space:]]\+$/ | endif
|
autocmd InsertLeave * if s:ShouldMatchWhitespace() | match ExtraWhitespace /\\\@<![\u3000[:space:]]\+$/ | endif
|
||||||
autocmd InsertEnter * if s:ShouldMatchWhitespace() | match ExtraWhitespace /[\u3000[:space:]]\+\%#\@<!$/ | 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(".")
|
||||||
silent! execute ':' . a:line1 . ',' . a:line2 . 's/\s\+$//'
|
silent! execute ':' . a:line1 . ',' . a:line2 . 's/\\\@<!\s\+$//'
|
||||||
call setpos('.', l:save_cursor)
|
call setpos('.', l:save_cursor)
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user