adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update runtime files

Browse Source
This commit is contained in:
Bram Moolenaar
2019-11-10 22:09:11 +01:00
parent a9aa86ff95
commit 5ef1c6a483
34 changed files with 1048 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/doc/diff.txt
View File

@ -1,4 +1,4 @@
*diff.txt* For Vim version 8.1. Last change: 2019 Jul 27
*diff.txt* For Vim version 8.1. Last change: 2019 Nov 10
VIM REFERENCE MANUAL by Bram Moolenaar
@ -68,11 +68,12 @@ reset to the global value.
The options can still be overruled from a modeline when re-editing the file.
However, 'foldmethod' and 'wrap' won't be set from a modeline when 'diff' is
set.
See `:diffoff` for an easy way to revert the options.
The differences shown are actually the differences in the buffer. Thus if you
make changes after loading a file, these will be included in the displayed
diffs. You might have to do ":diffupdate" now and then, not all changes are
immediately taken into account.
immediately taken into account, especially when using an external diff command.
In your .vimrc file you could do something special when Vim was started in
diff mode. You could use a construct like this: >