Pull all recent updates (#121)

Author: Cimbali

README.md

@@ -145,10 +145,17 @@ Whitespace highlighting is enabled by default, with a highlight color of red.
        when you save the file. This can be changed to only the modified lines, by adding
        the following to your `~/.vimrc`:
        ```
-       let g:strip_only_modified_lines=0
+       let g:strip_only_modified_lines=1
        ```
 
-*  To disable this plugin for specific file types, add the following to your `~/.vimrc`:
+    *  You can override the binary used to check which lines have been modified in the file.
+       For example to force a 'diff' installed in a different prefix and ignoring the changes
+       due to tab expansions, you can set the following:
+       ```
+       let g:diff_binary='/usr/local/bin/diff -E'
+       ```
+
+*  To disable the highlighting for specific file types, add the following to your `~/.vimrc`:
     ```vim
     let g:better_whitespace_filetypes_blacklist=['<filetype1>', '<filetype2>', '<etc>']
     ```
@@ -157,7 +164,7 @@ Whitespace highlighting is enabled by default, with a highlight color of red.
     ```vim
     ['diff', 'gitcommit', 'unite', 'qf', 'help', 'markdown']
     ```
-    If you do not want any of these filetypes unignored, simply include them in the
+    If you prefer to also keep these default filetypes ignored, simply include them in the
     blacklist:
     ```vim
     let g:better_whitespace_filetypes_blacklist=['<filetype1>', '<filetype2>', '<etc>',

doc/better-whitespace.txt

@@ -67,7 +67,13 @@ Overrides `g:better_whitespace_enabled`, and can be manually overriden with
 `g:strip_only_modified_lines`                     (defaults to 0)
 When stripping whitespace on save, only perform the stripping on the lines
 that have been modified.
-Uses `diff`, which should be available on all platforms (see |E810|).
+Uses an external `diff` command set in `g:diff_binary`, which should be
+available on all platforms (see |E810|).
+
+`g:diff_binary`
+The binary to use to check which lines have been modified in a file. Defaults
+to 'diff' on windows and 'command diff' on unix-like platforms (linux, mac OS,
+etc.) to bypass any shell aliases or default options for diff.
 
 `g:strip_max_file_size`                           (defaults to 1000)
 Skip stripping whitespace on files that have more lines than the value in this

plugin/better-whitespace.vim

@@ -65,6 +65,12 @@ call s:InitVariable('strip_max_file_size', 1000)
 " Disable verbosity by default
 call s:InitVariable('better_whitespace_verbosity', 0)
 
+" Bypass the aliases set for diff by default
+if has("win32") || has("win16")
+    call s:InitVariable('diff_binary', 'diff.exe')
+else
+    call s:InitVariable('diff_binary', 'command diff')
+endif
 
 " Section: Whitespace matching setup
 
@@ -95,18 +101,18 @@ function! s:WhitespaceInit()
 endfunction
 
 " Diff command returning a space-separated list of ranges of new/modified lines (as first,last)
-let s:diff_cmd='diff -a --unchanged-group-format="" --old-group-format="" --new-group-format="%dF,%dL " --changed-group-format="%dF,%dL " '
+let s:diff_cmd=g:diff_binary.' -a --unchanged-group-format="" --old-group-format="" --new-group-format="%dF,%dL " --changed-group-format="%dF,%dL " '
 
 " Section: Actual work functions
 
-" Function to implement trim() fro vim < 8.0.1630
-if v:version > 800 || (v:version == 800 && has('patch-1630'))
+" Function to implement trim() if it does not exist
+if exists('*trim')
     function! s:Trim(s)
         return trim(a:s)
     endfunction
 else
     function! s:Trim(s)
-        return substitute(a:s, '^\s*\(.\{-}\)\s*$', '\1', '')
+        return substitute(a:s, '^\_s*\(.\{-}\)\_s*$', '\1', '')
     endfunction
 endif
 
@@ -155,26 +161,25 @@ if g:current_line_whitespace_disabled_soft == 1
 else
     " Match Whitespace on all lines
     function! s:HighlightEOLWhitespace()
+        call <SID>ClearHighlighting()
         if <SID>ShouldHighlight()
-            exe 'match ExtraWhitespace "' . s:eol_whitespace_pattern . '"'
-        else
-            call <SID>ClearHighlighting()
+            let s:match_id = matchadd('ExtraWhitespace', s:eol_whitespace_pattern, 10, get(s:, 'match_id', -1))
         endif
     endfunction
 
     " Match Whitespace on all lines except the current one
     function! s:HighlightEOLWhitespaceExceptCurrentLine()
+        call <SID>ClearHighlighting()
         if <SID>ShouldHighlight()
-            exe 'match ExtraWhitespace "\%<' . line('.') .  'l' . s:eol_whitespace_pattern .
-                                   \ '\|\%>' . line('.') .  'l' . s:eol_whitespace_pattern . '"'
-        else
-            call <SID>ClearHighlighting()
+            let s:match_id = matchadd('ExtraWhitespace',
+                        \   '\%<' . line('.') .  'l' . s:eol_whitespace_pattern .
+                        \ '\|\%>' . line('.') .  'l' . s:eol_whitespace_pattern, 10, get(s:, 'match_id', -1))
         endif
     endfunction
 
     " Remove Whitespace matching
     function! s:ClearHighlighting()
-        match ExtraWhitespace ''
+        silent! call matchdelete(get(s:, 'match_id', -1))
     endfunction
 endif