diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-10-29 17:47:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-29 17:47:27 +0100 |
| commit | f5406dfe7772dca82e31f27c042c5718198f0ec8 (patch) | |
| tree | 4dd3a3c82b0f4e762d36501f19a652fc6b41ee48 /runtime/doc/diff.txt | |
| parent | cf93b5e9f9eea1b08ca8d7cb124265867b2f3bf9 (diff) | |
| parent | 6d1827aebc88698b75094029fb0a9e45c1d67632 (diff) | |
| download | rneovim-f5406dfe7772dca82e31f27c042c5718198f0ec8.tar.gz rneovim-f5406dfe7772dca82e31f27c042c5718198f0ec8.tar.bz2 rneovim-f5406dfe7772dca82e31f27c042c5718198f0ec8.zip | |
Merge #9164 from justinmk/vim-a2a80162deb1
vim-patch: runtime updates
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 50b53bcd3e..766240dfb0 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -372,12 +372,16 @@ Example (this does almost the same as 'diffexpr' being empty): > endif silent execute "!diff -a --binary " . opt . v:fname_in . " " . v:fname_new . \ " > " . v:fname_out + redraw! endfunction The "-a" argument is used to force comparing the files as text, comparing as binaries isn't useful. The "--binary" argument makes the files read in binary mode, so that a CTRL-Z doesn't end the text on DOS. +The `redraw!` command may not be needed, depending on whether executing a +shell command shows something on the display or not. + *E810* *E97* Vim will do a test if the diff output looks alright. If it doesn't, you will get an error message. Possible causes: @@ -429,4 +433,4 @@ evaluating 'patchexpr'. This hopefully avoids that files in the current directory are accidentally patched. Vim will also delete files starting with v:fname_in and ending in ".rej" and ".orig". - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: |