X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/5e613adedc4689fb4f0a58e51b44dd229066ab07..40bf56c5fffd581908407412c5b945522433cf82:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 6f5ea2e..c3c9e6b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -213,7 +213,6 @@ set viewoptions=cursor          " only save cursor position
 " diff mode {{{2
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
-set diffopt+=iwhite         " ignore white space
 set diffopt+=context:10     " 10 lines context between changes
 
 " reading and writing files {{{2
@@ -350,7 +349,7 @@ nnoremap <leader>p+ :silent! set paste<CR>"+p:set nopaste<CR>
 function! StripWhitespace(line1, line2, ...)  " {{{2
   let s_report = &report
   let &report=0
-  let pattern = a:0 ? a:1 : '[\\]\@<!\s\+$'
+  let pattern = a:0 ? a:1 : '\s\+$'
   let oldview = winsaveview()
   exe 'keepjumps keeppatterns '.a:line1.','.a:line2.'substitute/'.pattern.'//e'
   if oldview != winsaveview()