diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-11-16 16:13:51 -0500 |
---|---|---|
committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-11-16 16:40:25 -0500 |
commit | b83027858af71e5ca976c3b43e0b798c624f5529 (patch) | |
tree | beae2e17ceb60c68e7f421d6ccdd445063a55566 /runtime | |
parent | da7bb53d995b409208b29a5fd5941075230f1504 (diff) | |
download | rneovim-b83027858af71e5ca976c3b43e0b798c624f5529.tar.gz rneovim-b83027858af71e5ca976c3b43e0b798c624f5529.tar.bz2 rneovim-b83027858af71e5ca976c3b43e0b798c624f5529.zip |
vim-patch:8.1.2289: after :diffsplit closing the window does not disable diff
Problem: After :diffsplit closing the window does not disable diff.
Solution: Add "closeoff" to 'diffopt' and add it to the default.
https://github.com/vim/vim/commit/c8234779790dd873acb88331c50988adf94cc383
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. |