summaryrefslogtreecommitdiffstats
path: root/runtime/doc/diff.txt
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-08-11 18:00:22 +0200
committerBram Moolenaar <Bram@vim.org>2018-08-11 18:00:22 +0200
commitd473c8c101262702ea9eeb14907ee20a786942b2 (patch)
tree2837d2cd3d597959693ae8ffc8d0dd686c425f75 /runtime/doc/diff.txt
parentf53c692240851f71b930e80a0b0b5d4cfcc1b4a3 (diff)
Update runtime files.
Diffstat (limited to 'runtime/doc/diff.txt')
-rw-r--r--runtime/doc/diff.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 502fb49181..d56aea72ad 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -384,12 +384,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: