diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-04-17 15:32:49 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2023-04-17 15:46:24 +0800 |
| commit | 79a69337682ca0e3fc4d0bb9f70d851f8114bc9a (patch) | |
| tree | 001e142766b44da21d94b1ffc99d5230d7e6bee1 /runtime/doc/diff.txt | |
| parent | 481c6e6cac1d7219098408af5c396bada065be64 (diff) | |
| download | rneovim-79a69337682ca0e3fc4d0bb9f70d851f8114bc9a.tar.gz rneovim-79a69337682ca0e3fc4d0bb9f70d851f8114bc9a.tar.bz2 rneovim-79a69337682ca0e3fc4d0bb9f70d851f8114bc9a.zip | |
vim-patch:partial:6f4754b9f725
Update runtime files
https://github.com/vim/vim/commit/6f4754b9f7253d7e4ba527064a24aff1acdb1e8f
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index ead68c5f4f..2f174a404e 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -396,7 +396,9 @@ If the 'diffexpr' expression starts with s: or |<SID>|, then it is replaced with the script ID (|local-function|). Example: > set diffexpr=s:MyDiffExpr() set diffexpr=<SID>SomeDiffExpr() -< +Otherwise, the expression is evaluated in the context of the script where the +option was set, thus script-local items are available. + *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: @@ -452,5 +454,8 @@ If the 'patchexpr' expression starts with s: or |<SID>|, then it is replaced with the script ID (|local-function|). Example: > set patchexpr=s:MyPatchExpr() set patchexpr=<SID>SomePatchExpr() -< +Otherwise, the expression is evaluated in the context of the script where the +option was set, thus script-local items are available. + + vim:tw=78:ts=8:noet:ft=help:norl: |