diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-21 20:03:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-21 20:03:20 +0200 |
| commit | 6d150f783d5d3820fe69734dda1e79b8276a84d2 (patch) | |
| tree | 125a3491b68b80a72f67f07194d33cdbabc68d70 /runtime | |
| parent | e1fc51558dc14906a8d9f6a6e7bb1ac2a6ba8f3d (diff) | |
| download | vim-git-6d150f783d5d3820fe69734dda1e79b8276a84d2.tar.gz | |
patch 8.0.1743: terminal window options are named inconsistentlyv8.0.1743
Problem: Terminal window options are named inconsistently.
Solution: prefix terminal window options with "termwin". Keep the old names
for now as an alias.
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/options.txt | 6 | ||||
| -rw-r--r-- | runtime/optwin.vim | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index c196d3b42..b7f986959 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 8.0. Last change: 2018 Apr 18 +*options.txt* For Vim version 8.0. Last change: 2018 Apr 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -7444,7 +7444,9 @@ A jump table for the options with a short description can be found at |Q_op|. a S Argument list status as in default title. ({current} of {max}) Empty if the argument file count is zero or one. { NF Evaluate expression between '%{' and '}' and substitute result. - Note that there is no '%' before the closing '}'. + Note that there is no '%' before the closing '}'. The + expression cannot contain a '}' character, call a function to + work around that. ( - Start of item group. Can be used for setting the width and alignment of a section. Must be followed by %) somewhere. ) - End of item group. No width fields allowed. diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 128e92e65..d36ddea2c 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -506,12 +506,15 @@ if has("cursorbind") call <SID>BinOptionL("crb") endif if has("terminal") - call append("$", "termsize\tsize of a terminal window") + call append("$", "termwinsize\tsize of a terminal window") call append("$", "\t(local to window)") - call <SID>OptionL("tms") - call append("$", "termkey\tkey that precedes Vim commands in a terminal window") + call <SID>OptionL("tws") + call append("$", "termwinkey\tkey that precedes Vim commands in a terminal window") call append("$", "\t(local to window)") - call <SID>OptionL("tk") + call <SID>OptionL("twk") + call append("$", "termwinscroll\tmax number of lines to keep for scrollback in a terminal window") + call append("$", "\t(local to window)") + call <SID>OptionL("twsl") if exists("&winptydll") call append("$", "winptydll\tname of the winpty dynamic library") call <SID>OptionG("winptydll", &winptydll) |