summaryrefslogtreecommitdiffstats
path: root/runtime/doc
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/options.txt25
1 files changed, 15 insertions, 10 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index bbf9cf1ba4..0a70e13ebf 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 8.0. Last change: 2017 Jul 15
+*options.txt* For Vim version 8.0. Last change: 2017 Jul 23
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1319,8 +1319,6 @@ A jump table for the options with a short description can be found at |Q_op|.
'bufhidden' 'bh' string (default: "")
local to buffer
{not in Vi}
- {not available when compiled without the |+quickfix|
- feature}
This option specifies what happens when a buffer is no longer
displayed in a window:
<empty> follow the global 'hidden' option
@@ -1355,8 +1353,6 @@ A jump table for the options with a short description can be found at |Q_op|.
'buftype' 'bt' string (default: "")
local to buffer
{not in Vi}
- {not available when compiled without the |+quickfix|
- feature}
The value of this option specifies the type of a buffer:
<empty> normal buffer
nofile buffer which is not related to a file and will not be
@@ -1369,6 +1365,8 @@ A jump table for the options with a short description can be found at |Q_op|.
or list of locations |:lwindow|
help help buffer (you are not supposed to set this
manually)
+ terminal buffer for a |terminal| (you are not supposed to set
+ this manually)
This option is used together with 'bufhidden' and 'swapfile' to
specify special kinds of buffers. See |special-buffers|.
@@ -7760,19 +7758,26 @@ A jump table for the options with a short description can be found at |Q_op|.
{not in Vi}
The key that precedes a Vim command in a terminal window. Other keys
are sent to the job running in the window.
- The string must be one key stroke.
+ The string must be one key stroke but can be multiple bytes.
NOT IMPLEMENTED YET
- *'thesaurus'* *'tsr'*
+ *'termsize'* *'tms'*
'termsize' 'tms' string (default "")
local to window
{not in Vi}
Size of the |terminal| window. Format: {rows}x{columns}.
- When empty the terminal gets the size from the window.
- - When set (e.g., "24x80") the terminal size is fixed. If the window
- is smaller only the top-left part is displayed.
- NOT IMPLEMENTED YET
+ - When set (e.g., "24x80") the terminal size is not adjusted to the
+ window size. If the window is smaller only the top-left part is
+ displayed.
+ When rows is zero then use the height of the window.
+ When columns is zero then use the width of the window.
+ For example: "30x0" uses 30 rows with the current window width.
+ Using "0x0" is the same as empty.
+ Note that the command running in the terminal window may still change
+ the size of the terminal. In that case the Vim window will be
+ adjusted to that size, if possible.
*'terse'* *'noterse'*
'terse' boolean (default off)