Skip to content

Commit c572da5

Browse files
committed
Update runtime files
1 parent 7adf06f commit c572da5

26 files changed

Lines changed: 727 additions & 135 deletions

runtime/doc/editing.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*editing.txt* For Vim version 8.0. Last change: 2017 Aug 01
1+
*editing.txt* For Vim version 8.0. Last change: 2017 Aug 21
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1109,6 +1109,7 @@ The names can be in upper- or lowercase.
11091109
window in the current tab page the current tab page is
11101110
closed |tab-page|.
11111111
Triggers the |QuitPre| autocommand event.
1112+
See |CTRL-W_q| for quitting another window.
11121113

11131114
:conf[irm] q[uit] Quit, but give prompt when changes have been made, or
11141115
the last file in the argument list has not been

runtime/doc/eval.txt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.0. Last change: 2017 Aug 11
1+
*eval.txt* For Vim version 8.0. Last change: 2017 Aug 13
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -5225,6 +5225,7 @@ job_setoptions({job}, {options}) *job_setoptions()*
52255225
job_start({command} [, {options}]) *job_start()*
52265226
Start a job and return a Job object. Unlike |system()| and
52275227
|:!cmd| this does not wait for the job to finish.
5228+
To start a job in a terminal window see |term_start()|.
52285229

52295230
{command} can be a String. This works best on MS-Windows. On
52305231
Unix it is split up in white-separated parts to be passed to
@@ -5963,7 +5964,7 @@ mode([expr]) Return a string that indicates the current mode.
59635964
a non-empty String (|non-zero-arg|), then the full mode is
59645965
returned, otherwise only the first letter is returned.
59655966

5966-
n Normal
5967+
n Normal, Terminal-Normal
59675968
no Operator-pending
59685969
v Visual by character
59695970
V Visual by line
@@ -5985,6 +5986,7 @@ mode([expr]) Return a string that indicates the current mode.
59855986
rm The -- more -- prompt
59865987
r? A |:confirm| query of some sort
59875988
! Shell or external command is executing
5989+
t Terminal-Job mode: keys go to the job
59885990
This is useful in the 'statusline' option or when used
59895991
with |remote_expr()| In most other places it always returns
59905992
"c" or "n".
@@ -7720,12 +7722,12 @@ synconcealed({lnum}, {col}) *synconcealed()*
77207722
the text is "123456" and both "23" and "45" are concealed
77217723
and replace by the character "X", then:
77227724
call returns ~
7723-
synconcealed(lnum, 1) [0, '', 0]
7724-
synconcealed(lnum, 2) [1, 'X', 1]
7725-
synconcealed(lnum, 3) [1, 'X', 1]
7726-
synconcealed(lnum, 4) [1, 'X', 2]
7727-
synconcealed(lnum, 5) [1, 'X', 2]
7728-
synconcealed(lnum, 6) [0, '', 0]
7725+
synconcealed(lnum, 1) [0, '', 0]
7726+
synconcealed(lnum, 2) [1, 'X', 1]
7727+
synconcealed(lnum, 3) [1, 'X', 1]
7728+
synconcealed(lnum, 4) [1, 'X', 2]
7729+
synconcealed(lnum, 5) [1, 'X', 2]
7730+
synconcealed(lnum, 6) [0, '', 0]
77297731

77307732

77317733
synstack({lnum}, {col}) *synstack()*
@@ -8633,7 +8635,7 @@ wordcount() *wordcount()*
86338635
(only in Visual mode)
86348636
visual_chars Number of chars visually selected
86358637
(only in Visual mode)
8636-
visual_words Number of chars visually selected
8638+
visual_words Number of words visually selected
86378639
(only in Visual mode)
86388640

86398641

runtime/doc/gui.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*gui.txt* For Vim version 8.0. Last change: 2017 Jul 15
1+
*gui.txt* For Vim version 8.0. Last change: 2017 Aug 27
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -67,7 +67,7 @@ When the GUI starts up initializations are carried out, in this order:
6767
executed as an Ex command.
6868
- If the user gvimrc file exists, it is sourced. The name of this file is
6969
normally "$HOME/.gvimrc". You can check this with ":version".
70-
- For Win32, when $HOME is not set, "$VIM\_gvimrc" is used.
70+
- For Win32, $HOME is set by Vim if needed, see |$HOME-windows|.
7171
- When a "_gvimrc" file is not found, ".gvimrc" is tried too. And vice
7272
versa.
7373
The name of the first file found is stored in $MYGVIMRC, unless it was

runtime/doc/intro.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*intro.txt* For Vim version 8.0. Last change: 2017 Aug 05
1+
*intro.txt* For Vim version 8.0. Last change: 2017 Aug 24
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -839,10 +839,12 @@ by Vim. {Vi: not ok}
839839
==============================================================================
840840
8. Definitions *definitions*
841841

842+
buffer Contains lines of text, usually read from a file.
842843
screen The whole area that Vim uses to work in. This can be
843844
a terminal emulator window. Also called "the Vim
844845
window".
845-
window A view on a buffer.
846+
window A view on a buffer. There can be multiple windows for
847+
one buffer.
846848

847849
A screen contains one or more windows, separated by status lines and with the
848850
command line at the bottom.

runtime/doc/options.txt

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.0. Last change: 2017 Jul 31
1+
*options.txt* For Vim version 8.0. Last change: 2017 Aug 27
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -417,12 +417,13 @@ On Unix systems the form "${HOME}" can be used too. The name between {} can
417417
contain non-id characters then. Note that if you want to use this for the
418418
"gf" command, you need to add the '{' and '}' characters to 'isfname'.
419419

420-
On MS-Windows, if $HOME is not defined as an environment variable, then
421-
at runtime Vim will set it to the expansion of $HOMEDRIVE$HOMEPATH.
422-
423420
NOTE: expanding environment variables and "~/" is only done with the ":set"
424421
command, not when assigning a value to an option with ":let".
425422

423+
*$HOME-windows*
424+
On MS-Windows, if $HOME is not defined as an environment variable, then
425+
at runtime Vim will set it to the expansion of $HOMEDRIVE$HOMEPATH.
426+
426427

427428
Note the maximum length of an expanded option is limited. How much depends on
428429
the system, mostly it is something like 256 or 1024 characters.
@@ -889,6 +890,10 @@ A jump table for the options with a short description can be found at |Q_op|.
889890
"screen.linux", "cygwin" or "putty", or $COLORFGBG suggests a dark
890891
background. Otherwise the default is "light".
891892

893+
The |:terminal| command and the |term_start()| function use the
894+
'background' value to decide whether the terminal window will start
895+
with a white or black background.
896+
892897
Normally this option would be set in the .vimrc file. Possibly
893898
depending on the terminal name. Example: >
894899
:if &term == "pcterm"
@@ -4041,7 +4046,7 @@ A jump table for the options with a short description can be found at |Q_op|.
40414046
x:PmenuSbar,X:PmenuThumb,*:TabLine,
40424047
#:TabLineSel,_:TabLineFill,!:CursorColumn,
40434048
.:CursorLine,o:ColorColumn,q:QuickFixLine,
4044-
$:StatusLineTerm")
4049+
z:StatusLineTerm,Z:StatusLineTermNC")
40454050
global
40464051
{not in Vi}
40474052
This option can be used to set highlighting mode for various
@@ -5723,18 +5728,6 @@ A jump table for the options with a short description can be found at |Q_op|.
57235728
< Replace the ';' with a ':' or whatever separator is used. Note that
57245729
this doesn't work when $INCL contains a comma or white space.
57255730

5726-
*'perldll'*
5727-
'perldll' string (default depends on the build)
5728-
global
5729-
{not in Vi}
5730-
{only available when compiled with the |+perl/dyn|
5731-
feature}
5732-
Specifies the name of the Perl shared library. The default is
5733-
DYNAMIC_PERL_DLL, which was specified at compile time.
5734-
Environment variables are expanded |:set_env|.
5735-
This option cannot be set from a |modeline| or in the |sandbox|, for
5736-
security reasons.
5737-
57385731
*'preserveindent'* *'pi'* *'nopreserveindent'* *'nopi'*
57395732
'preserveindent' 'pi' boolean (default off)
57405733
local to buffer
@@ -8839,7 +8832,7 @@ A jump table for the options with a short description can be found at |Q_op|.
88398832
feature on MS-Windows}
88408833
Specifies the name of the winpty shared library, used for the
88418834
|:terminal| command. The default depends on whether was build as a
8842-
32-bit or 64-bit executable. If not found, "win32pty.dll" is tried as
8835+
32-bit or 64-bit executable. If not found, "winpty.dll" is tried as
88438836
a fallback.
88448837
Environment variables are expanded |:set_env|.
88458838
This option cannot be set from a |modeline| or in the |sandbox|, for

runtime/doc/quickref.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*quickref.txt* For Vim version 8.0. Last change: 2017 Aug 01
1+
*quickref.txt* For Vim version 8.0. Last change: 2017 Aug 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -974,6 +974,7 @@ Short explanation of each option: *option-list*
974974
'winfixwidth' 'wfw' keep window width when opening/closing windows
975975
'winminheight' 'wmh' minimum number of lines for any window
976976
'winminwidth' 'wmw' minimal number of columns for any window
977+
'winptydll' name of the winpty dynamic library
977978
'winwidth' 'wiw' minimal number of columns for current window
978979
'wrap' long lines wrap and continue on the next line
979980
'wrapmargin' 'wm' chars from the right where wrapping starts

runtime/doc/syntax.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*syntax.txt* For Vim version 8.0. Last change: 2017 Jul 14
1+
*syntax.txt* For Vim version 8.0. Last change: 2017 Aug 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2138,6 +2138,16 @@ set "msql_minlines" to the value you desire. Example: >
21382138
:let msql_minlines = 200
21392139
21402140
2141+
N1QL *n1ql.vim* *ft-n1ql-syntax*
2142+
2143+
N1QL is a SQL-like declarative language for manipulating JSON documents in
2144+
Couchbase Server databases.
2145+
2146+
Vim syntax highlights N1QL statements, keywords, operators, types, comments,
2147+
and special values. Vim ignores syntactical elements specific to SQL or its
2148+
many dialects, like COLUMN or CHAR, that don't exist in N1QL.
2149+
2150+
21412151
NCF *ncf.vim* *ft-ncf-syntax*
21422152

21432153
There is one option for NCF syntax highlighting.

runtime/doc/tags

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,6 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
746746
'path' options.txt /*'path'*
747747
'pdev' options.txt /*'pdev'*
748748
'penc' options.txt /*'penc'*
749-
'perldll' options.txt /*'perldll'*
750749
'pex' options.txt /*'pex'*
751750
'pexpr' options.txt /*'pexpr'*
752751
'pfn' options.txt /*'pfn'*
@@ -935,6 +934,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
935934
't_Co' term.txt /*'t_Co'*
936935
't_Cs' term.txt /*'t_Cs'*
937936
't_DL' term.txt /*'t_DL'*
937+
't_EC' term.txt /*'t_EC'*
938938
't_EI' term.txt /*'t_EI'*
939939
't_F1' term.txt /*'t_F1'*
940940
't_F2' term.txt /*'t_F2'*
@@ -972,11 +972,15 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
972972
't_PS' term.txt /*'t_PS'*
973973
't_RB' term.txt /*'t_RB'*
974974
't_RI' term.txt /*'t_RI'*
975+
't_RS' term.txt /*'t_RS'*
975976
't_RV' term.txt /*'t_RV'*
977+
't_SC' term.txt /*'t_SC'*
978+
't_SH' term.txt /*'t_SH'*
976979
't_SI' term.txt /*'t_SI'*
977980
't_SR' term.txt /*'t_SR'*
978981
't_Sb' term.txt /*'t_Sb'*
979982
't_Sf' term.txt /*'t_Sf'*
983+
't_VS' term.txt /*'t_VS'*
980984
't_WP' term.txt /*'t_WP'*
981985
't_WS' term.txt /*'t_WS'*
982986
't_ZH' term.txt /*'t_ZH'*
@@ -1167,6 +1171,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
11671171
'winheight' options.txt /*'winheight'*
11681172
'winminheight' options.txt /*'winminheight'*
11691173
'winminwidth' options.txt /*'winminwidth'*
1174+
'winptydll' options.txt /*'winptydll'*
11701175
'winwidth' options.txt /*'winwidth'*
11711176
'wiv' options.txt /*'wiv'*
11721177
'wiw' options.txt /*'wiw'*
@@ -4537,6 +4542,7 @@ E944 pattern.txt /*E944*
45374542
E945 pattern.txt /*E945*
45384543
E946 terminal.txt /*E946*
45394544
E947 terminal.txt /*E947*
4545+
E948 terminal.txt /*E948*
45404546
E95 message.txt /*E95*
45414547
E96 diff.txt /*E96*
45424548
E97 diff.txt /*E97*
@@ -6134,6 +6140,7 @@ ft-mathematica-syntax syntax.txt /*ft-mathematica-syntax*
61346140
ft-mma-syntax syntax.txt /*ft-mma-syntax*
61356141
ft-moo-syntax syntax.txt /*ft-moo-syntax*
61366142
ft-msql-syntax syntax.txt /*ft-msql-syntax*
6143+
ft-n1ql-syntax syntax.txt /*ft-n1ql-syntax*
61376144
ft-nasm-syntax syntax.txt /*ft-nasm-syntax*
61386145
ft-ncf-syntax syntax.txt /*ft-ncf-syntax*
61396146
ft-nroff-syntax syntax.txt /*ft-nroff-syntax*
@@ -7377,6 +7384,7 @@ mzscheme-vim if_mzsch.txt /*mzscheme-vim*
73777384
mzscheme-vimext if_mzsch.txt /*mzscheme-vimext*
73787385
mzscheme-window if_mzsch.txt /*mzscheme-window*
73797386
n pattern.txt /*n*
7387+
n1ql.vim syntax.txt /*n1ql.vim*
73807388
nasm.vim syntax.txt /*nasm.vim*
73817389
navigation motion.txt /*navigation*
73827390
nb-commands netbeans.txt /*nb-commands*
@@ -7720,6 +7728,7 @@ no-type-checking eval.txt /*no-type-checking*
77207728
no_buffers_menu gui.txt /*no_buffers_menu*
77217729
no_mail_maps filetype.txt /*no_mail_maps*
77227730
no_plugin_maps filetype.txt /*no_plugin_maps*
7731+
nocombine syntax.txt /*nocombine*
77237732
non-greedy pattern.txt /*non-greedy*
77247733
non-zero-arg eval.txt /*non-zero-arg*
77257734
none-variable eval.txt /*none-variable*
@@ -8537,12 +8546,14 @@ t_AL term.txt /*t_AL*
85378546
t_BD term.txt /*t_BD*
85388547
t_BE term.txt /*t_BE*
85398548
t_CS term.txt /*t_CS*
8549+
t_CTRL-W_CTRL-C terminal.txt /*t_CTRL-W_CTRL-C*
85408550
t_CTRL-\_CTRL-N terminal.txt /*t_CTRL-\\_CTRL-N*
85418551
t_CV term.txt /*t_CV*
85428552
t_Ce term.txt /*t_Ce*
85438553
t_Co term.txt /*t_Co*
85448554
t_Cs term.txt /*t_Cs*
85458555
t_DL term.txt /*t_DL*
8556+
t_EC term.txt /*t_EC*
85468557
t_EI term.txt /*t_EI*
85478558
t_F1 term.txt /*t_F1*
85488559
t_F2 term.txt /*t_F2*
@@ -8580,11 +8591,15 @@ t_PE term.txt /*t_PE*
85808591
t_PS term.txt /*t_PS*
85818592
t_RB term.txt /*t_RB*
85828593
t_RI term.txt /*t_RI*
8594+
t_RS term.txt /*t_RS*
85838595
t_RV term.txt /*t_RV*
8596+
t_SC term.txt /*t_SC*
8597+
t_SH term.txt /*t_SH*
85848598
t_SI term.txt /*t_SI*
85858599
t_SR term.txt /*t_SR*
85868600
t_Sb term.txt /*t_Sb*
85878601
t_Sf term.txt /*t_Sf*
8602+
t_VS term.txt /*t_VS*
85888603
t_WP term.txt /*t_WP*
85898604
t_WS term.txt /*t_WS*
85908605
t_ZH term.txt /*t_ZH*
@@ -8827,6 +8842,7 @@ termcap-title term.txt /*termcap-title*
88278842
terminal terminal.txt /*terminal*
88288843
terminal-colors os_unix.txt /*terminal-colors*
88298844
terminal-debug terminal.txt /*terminal-debug*
8845+
terminal-functions usr_41.txt /*terminal-functions*
88308846
terminal-info term.txt /*terminal-info*
88318847
terminal-key-codes term.txt /*terminal-key-codes*
88328848
terminal-options term.txt /*terminal-options*

runtime/doc/term.txt

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*term.txt* For Vim version 8.0. Last change: 2017 Jul 21
1+
*term.txt* For Vim version 8.0. Last change: 2017 Aug 26
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -301,7 +301,7 @@ OUTPUT CODES *terminal-output-codes*
301301
t_vb visual bell *t_vb* *'t_vb'*
302302
t_ve cursor visible *t_ve* *'t_ve'*
303303
t_vi cursor invisible *t_vi* *'t_vi'*
304-
t_vs cursor very visible *t_vs* *'t_vs'*
304+
t_vs cursor very visible (blink) *t_vs* *'t_vs'*
305305
*t_xs* *'t_xs'*
306306
t_xs if non-empty, standout not erased by overwriting (hpterm)
307307
*t_xn* *'t_xn'*
@@ -316,6 +316,7 @@ Added by Vim (there are no standard codes for these):
316316
t_WP set window position (Y, X) in pixels *t_WP* *'t_WP'*
317317
t_GP get window position (Y, X) in pixels *t_GP* *'t_GP'*
318318
t_WS set window size (height, width in cells) *t_WS* *'t_WS'*
319+
t_VS cursor normally visible (no blink) *t_VS* *'t_VS'*
319320
t_SI start insert mode (bar cursor shape) *t_SI* *'t_SI'*
320321
t_SR start replace mode (underline cursor shape) *t_SR* *'t_SR'*
321322
t_EI end insert or replace mode (block cursor shape) *t_EI* *'t_EI'*
@@ -333,6 +334,28 @@ Added by Vim (there are no standard codes for these):
333334
|xterm-bracketed-paste|
334335
t_BD disable bracketed paste mode *t_BD* *'t_BD'*
335336
|xterm-bracketed-paste|
337+
t_SC set cursor color start *t_SC* *'t_SC'*
338+
t_EC set cursor color end *t_EC* *'t_EC'*
339+
t_SH set cursor shape *t_SH* *'t_SH'*
340+
t_RS request terminal cursor style *t_RS* *'t_RS'*
341+
342+
Some codes have a start, middle and end part. The start and end are defined
343+
by the termcap option, the middle part is text.
344+
set title text: t_ts {title text} t_fs
345+
set icon text: t_IS {icon text} t_IE
346+
set cursor color: t_SC {color name} t_EC
347+
348+
t_SH must take one argument:
349+
0, 1 or none blinking block cursor
350+
2 block cursor
351+
3 blinking underline cursor
352+
4 underline cursor
353+
5 blinking vertical bar cursor
354+
6 vertical bar cursor
355+
356+
t_RS is sent only if the response to t_RV has been received. It is not used
357+
on Mac OS when Terminal.app could be recognized from the termresponse.
358+
336359

337360
KEY CODES *terminal-key-codes*
338361
Note: Use the <> form if possible

0 commit comments

Comments
 (0)