diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2022-02-27 11:56:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-27 11:56:30 +0100 |
| commit | 9d3370a14429587303d3abe6d4ece71342f5e4b5 (patch) | |
| tree | abff6a0068dc2809c3f43a4af3b13fe037498b42 /runtime/doc/diff.txt | |
| parent | 7dd2b0b79a34a7b3560971bc7c1466621134e469 (diff) | |
| download | rneovim-9d3370a14429587303d3abe6d4ece71342f5e4b5.tar.gz rneovim-9d3370a14429587303d3abe6d4ece71342f5e4b5.tar.bz2 rneovim-9d3370a14429587303d3abe6d4ece71342f5e4b5.zip | |
vim-patch:c51cf0329809 (#17530)
Update runtime files.
https://github.com/vim/vim/commit/c51cf0329809c7ae946c59d6f56699227efc9d1b
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index abe99102ee..9c5792dd43 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -371,13 +371,13 @@ Example (this does almost the same as 'diffexpr' being empty): > function MyDiff() let opt = "" if &diffopt =~ "icase" - let opt = opt . "-i " + let opt = opt .. "-i " endif if &diffopt =~ "iwhite" - let opt = opt . "-b " + let opt = opt .. "-b " endif - silent execute "!diff -a --binary " . opt . v:fname_in . " " . v:fname_new . - \ " > " . v:fname_out + silent execute "!diff -a --binary " .. opt .. v:fname_in .. " " .. v:fname_new .. + \ " > " .. v:fname_out redraw! endfunction @@ -427,8 +427,8 @@ Example (this does the same as 'patchexpr' being empty): > set patchexpr=MyPatch() function MyPatch() - :call system("patch -o " . v:fname_out . " " . v:fname_in . - \ " < " . v:fname_diff) + :call system("patch -o " .. v:fname_out .. " " .. v:fname_in .. + \ " < " .. v:fname_diff) endfunction Make sure that using the "patch" program doesn't have unwanted side effects. |