diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-11-16 18:43:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-16 18:43:03 -0800 |
| commit | a45890e82e7cff52f9473d631a5439d2d368daa2 (patch) | |
| tree | 8beada2a3533eff9722d5069499111ec889d33f8 /runtime | |
| parent | 7116a41e30903580b7527203b87f6afb26095654 (diff) | |
| parent | 3056ff4b8c39ea0679a564760c607021df4ad14f (diff) | |
| download | rneovim-a45890e82e7cff52f9473d631a5439d2d368daa2.tar.gz rneovim-a45890e82e7cff52f9473d631a5439d2d368daa2.tar.bz2 rneovim-a45890e82e7cff52f9473d631a5439d2d368daa2.zip | |
Merge #11406 from janlazo/vim-8.1.1922
vim-patch:8.1.{1922,2289,2305}
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/options.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index d29d9c2676..e64ff1b12c 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1875,7 +1875,7 @@ A jump table for the options with a short description can be found at |Q_op|. security reasons. *'dip'* *'diffopt'* -'diffopt' 'dip' string (default "internal,filler") +'diffopt' 'dip' string (default "internal,filler,closeoff") global Option settings for diff mode. It can consist of the following items. All are optional. Items must be separated by a comma. @@ -1932,6 +1932,12 @@ A jump table for the options with a short description can be found at |Q_op|. vertical Start diff mode with vertical splits (unless explicitly specified otherwise). + closeoff When a window is closed where 'diff' is set + and there is only one window remaining in the + same tab page with 'diff' set, execute + `:diffoff` in that window. This undoes a + `:diffsplit` command. + hiddenoff Do not use diff mode for a buffer when it becomes hidden. |