patch 8.0.1743: terminal window options are named inconsistently
Problem: Terminal window options are named inconsistently.
Solution: prefix terminal window options with "termwin". Keep the old names
for now as an alias.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c196d3b..b7f9869 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 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 128e92e..d36ddea 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -506,12 +506,15 @@
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)