From 07fdbba9d0a5cce9d466c36fbbaa9fe1cdeb1428 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 29 Oct 2018 09:50:39 +0100 Subject: vim-patch:91f84f6e11cd Update runtime files. https://github.com/vim/vim/commit/91f84f6e11cd879d43d651c0903d85bff95f0716 --- runtime/doc/diff.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/doc/diff.txt') diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 50b53bcd3e..b83fddd845 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -429,4 +429,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: -- cgit From 228bc4c416092eb2601329aa881915a565ee64d2 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 29 Oct 2018 09:57:50 +0100 Subject: vim-patch:d473c8c10126 Update runtime files. https://github.com/vim/vim/commit/d473c8c101262702ea9eeb14907ee20a786942b2 --- runtime/doc/diff.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'runtime/doc/diff.txt') 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: -- cgit