diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-10-29 09:57:50 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-10-29 10:01:44 +0100 |
| commit | 228bc4c416092eb2601329aa881915a565ee64d2 (patch) | |
| tree | 6dc3b62a9a0edcf475ecad10f182b3929bfe066c /runtime/doc/diff.txt | |
| parent | 4f67f5ba6e5c9c1a8483e2b1f5faaa48bfb221ad (diff) | |
| download | rneovim-228bc4c416092eb2601329aa881915a565ee64d2.tar.gz rneovim-228bc4c416092eb2601329aa881915a565ee64d2.tar.bz2 rneovim-228bc4c416092eb2601329aa881915a565ee64d2.zip | |
vim-patch:d473c8c10126
Update runtime files.
https://github.com/vim/vim/commit/d473c8c101262702ea9eeb14907ee20a786942b2
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index b83fddd845..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: |