diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-10 21:00:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-10 21:00:27 +0100 |
| commit | c8234779790dd873acb88331c50988adf94cc383 (patch) | |
| tree | d3e58b31d9e4593956cd028e4468051ce3d79dfc /runtime | |
| parent | 5c6b6187ac51a4d8545e823c1be6cdf70cac8a57 (diff) | |
patch 8.1.2289: after :diffsplit closing the window does not disable diffv8.1.2289
Problem: After :diffsplit closing the window does not disable diff.
Solution: Add "closeoff" to 'diffopt' and add it to the default.
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/options.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 738dc7fcc9..42c7510cc3 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2591,7 +2591,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 {not available when compiled without the |+diff| feature} @@ -2650,6 +2650,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. @@ -2933,6 +2939,9 @@ A jump table for the options with a short description can be found at |Q_op|. won't work by default. NOTE: This option is set to the Vi default value when 'compatible' is set and to the Vim default value when 'compatible' is reset. + NOTE: when this option is off then the |modifyOtherKeys| functionality + is disabled while in Insert mode to avoid ending Insert mode with any + key that has a modifier. *'eventignore'* *'ei'* 'eventignore' 'ei' string (default "") |