summaryrefslogtreecommitdiffstats
path: root/runtime/doc/diff.txt
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-02-26 12:25:45 +0000
committerBram Moolenaar <Bram@vim.org>2022-02-26 12:25:45 +0000
commitc51cf0329809c7ae946c59d6f56699227efc9d1b (patch)
tree825302ef0857905dbf08dc584ef6d6a8aae27790 /runtime/doc/diff.txt
parente41c1dd8890d3f701253255993f4e9af2d12225c (diff)
Update runtime files.
Diffstat (limited to 'runtime/doc/diff.txt')
-rw-r--r--runtime/doc/diff.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index d72f37ea4f..fad680148a 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -382,13 +382,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
@@ -445,8 +445,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.