diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-09-22 14:42:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-09-22 14:42:24 +0200 |
| commit | baca7f705babaa1caeb0bce7f63f6275feca6641 (patch) | |
| tree | ab045d9c9d5f5d0287b2b002337f2a41291cd629 /runtime/doc/diff.txt | |
| parent | 595cad2ea1c77c40a34a240c71290fdef6aabd3b (diff) | |
| download | vim-git-baca7f705babaa1caeb0bce7f63f6275feca6641.tar.gz | |
Update runtime files. Add support for J.
Diffstat (limited to 'runtime/doc/diff.txt')
| -rw-r--r-- | runtime/doc/diff.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index ddf8aacd6..96dff3509 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.4. Last change: 2013 Jul 07 +*diff.txt* For Vim version 7.4. Last change: 2013 Sep 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -123,10 +123,14 @@ Since the option values are remembered with the buffer, you can edit another file for a moment and come back to the same file and be in diff mode again. *:diffo* *:diffoff* -:diffo[ff] Switch off diff mode for the current window. +:diffo[ff] Switch off diff mode for the current window. Resets related + options also when 'diff' was not set. :diffo[ff]! Switch off diff mode for the current window and in all windows - in the current tab page where 'diff' is set. + in the current tab page where 'diff' is set. Resetting + related options only happens in a window that has 'diff' set, + if the current window does not have 'diff' set then no options + in it are changed. The ":diffoff" command resets the relevant options to the values they had when using |:diffsplit|, |:diffpatch| , |:diffthis|. or starting Vim in diff mode. |