Skip to content

Commit 96715fc

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 8c56d1c + f65cc66 commit 96715fc

90 files changed

Lines changed: 24581 additions & 13170 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

runtime/doc/builtin.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4898,10 +4898,10 @@ invert({expr}) *invert()*
48984898
< Can also be used as a |method|: >
48994899
:let bits = bits->invert()
49004900
4901-
isabsolutepath({directory}) *isabsolutepath()*
4901+
isabsolutepath({path}) *isabsolutepath()*
49024902
The result is a Number, which is |TRUE| when {path} is an
49034903
absolute path.
4904-
< On Unix, a path is considered absolute when it starts with '/'.
4904+
On Unix, a path is considered absolute when it starts with '/'.
49054905
On MS-Windows, it is considered absolute when it starts with an
49064906
optional drive prefix and is followed by a '\' or '/'. UNC paths
49074907
are always absolute.
@@ -4911,7 +4911,7 @@ isabsolutepath({directory}) *isabsolutepath()*
49114911
echo isabsolutepath('C:\Windows') " 1
49124912
echo isabsolutepath('foobar') " 0
49134913
echo isabsolutepath('\\remote\file') " 1
4914-
4914+
<
49154915
Can also be used as a |method|: >
49164916
GetName()->isabsolutepath()
49174917
@@ -10421,7 +10421,7 @@ bsd Compiled on an OS in the BSD family (excluding macOS).
1042110421
builtin_terms Compiled with some builtin terminals.
1042210422
byte_offset Compiled with support for 'o' in 'statusline'
1042310423
channel Compiled with support for |channel| and |job|
10424-
cindent Compiled with 'cindent' support.
10424+
cindent Compiled with 'cindent' support. (always true)
1042510425
clientserver Compiled with remote invocation support |clientserver|.
1042610426
clipboard Compiled with 'clipboard' support.
1042710427
clipboard_working Compiled with 'clipboard' support and it can be used.
@@ -10483,7 +10483,7 @@ insert_expand Compiled with support for CTRL-X expansion commands in
1048310483
Insert mode. (always true)
1048410484
job Compiled with support for |channel| and |job|
1048510485
ipv6 Compiled with support for IPv6 networking in |channel|.
10486-
jumplist Compiled with |jumplist| support.
10486+
jumplist Compiled with |jumplist| support. (always true)
1048710487
keymap Compiled with 'keymap' support.
1048810488
lambda Compiled with |lambda| support.
1048910489
langmap Compiled with 'langmap' support.
@@ -10492,6 +10492,7 @@ linebreak Compiled with 'linebreak', 'breakat', 'showbreak' and
1049210492
'breakindent' support.
1049310493
linux Linux version of Vim.
1049410494
lispindent Compiled with support for lisp indenting.
10495+
(always true)
1049510496
listcmds Compiled with commands for the buffer list |:files|
1049610497
and the argument list |arglist|.
1049710498
localmap Compiled with local mappings and abbr. |:map-local|
@@ -10521,7 +10522,7 @@ mzscheme Compiled with MzScheme interface |mzscheme|.
1052110522
nanotime Compiled with sub-second time stamp checks.
1052210523
netbeans_enabled Compiled with support for |netbeans| and connected.
1052310524
netbeans_intg Compiled with support for |netbeans|.
10524-
num64 Compiled with 64-bit |Number| support.
10525+
num64 Compiled with 64-bit |Number| support. (always true)
1052510526
ole Compiled with OLE automation support for Win32.
1052610527
osx Compiled for macOS cf. mac
1052710528
osxdarwin Compiled for macOS, with |mac-darwin-feature|
@@ -10547,7 +10548,7 @@ ruby Compiled with Ruby interface |ruby|.
1054710548
scrollbind Compiled with 'scrollbind' support. (always true)
1054810549
showcmd Compiled with 'showcmd' support.
1054910550
signs Compiled with |:sign| support.
10550-
smartindent Compiled with 'smartindent' support.
10551+
smartindent Compiled with 'smartindent' support. (always true)
1055110552
sodium Compiled with libsodium for better crypt support
1055210553
sound Compiled with sound support, e.g. `sound_playevent()`
1055310554
spell Compiled with spell checking support |spell|.
@@ -10561,7 +10562,7 @@ syntax_items There are active syntax highlighting items for the
1056110562
current buffer.
1056210563
system Compiled to use system() instead of fork()/exec().
1056310564
tag_binary Compiled with binary searching in tags files
10564-
|tag-binary-search|.
10565+
|tag-binary-search|. (always true)
1056510566
tag_old_static Support for old static tags was removed, see
1056610567
|tag-old-static|.
1056710568
tcl Compiled with Tcl interface.
@@ -10575,6 +10576,7 @@ tgetent Compiled with tgetent support, able to use a termcap
1057510576
or terminfo file.
1057610577
timers Compiled with |timer_start()| support.
1057710578
title Compiled with window title support |'title'|.
10579+
(always true)
1057810580
toolbar Compiled with support for |gui-toolbar|.
1057910581
ttyin input is a terminal (tty)
1058010582
ttyout output is a terminal (tty)
@@ -10593,6 +10595,7 @@ viminfo Compiled with viminfo support.
1059310595
vimscript-1 Compiled Vim script version 1 support
1059410596
vimscript-2 Compiled Vim script version 2 support
1059510597
vimscript-3 Compiled Vim script version 3 support
10598+
vimscript-4 Compiled Vim script version 4 support
1059610599
virtualedit Compiled with 'virtualedit' option. (always true)
1059710600
visual Compiled with Visual mode. (always true)
1059810601
visualextra Compiled with extra Visual mode commands. (always

runtime/doc/channel.txt

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*channel.txt* For Vim version 8.2. Last change: 2022 Jun 04
1+
*channel.txt* For Vim version 8.2. Last change: 2022 Jun 23
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -464,8 +464,10 @@ a close callback to the channel.
464464

465465
To read all normal output from a RAW channel that is available: >
466466
let output = ch_readraw(channel)
467-
To read the error output: >
467+
To read all error output from a RAW channel that is available:: >
468468
let output = ch_readraw(channel, {"part": "err"})
469+
Note that if the channel is in NL mode, ch_readraw() will only return one line
470+
for each call.
469471

470472
ch_read() and ch_readraw() use the channel timeout. When there is nothing to
471473
read within that time an empty string is returned. To specify a different
@@ -1552,36 +1554,5 @@ The "params" field is optional: >
15521554
"params": <list|dict>
15531555
}
15541556
1555-
Depending on the use case, you can use the ch_evalexpr(), ch_sendexpr() and
1556-
ch_sendraw() functions on the same channel.
1557-
1558-
A LSP request message has the following format (expressed as a Vim Dict). The
1559-
"params" field is optional: >
1560-
1561-
{
1562-
"jsonrpc": "2.0",
1563-
"id": <number>,
1564-
"method": <string>,
1565-
"params": <list|dict>
1566-
}
1567-
1568-
A LSP response message has the following format (expressed as a Vim Dict). The
1569-
"result" and "error" fields are optional: >
1570-
1571-
{
1572-
"jsonrpc": "2.0",
1573-
"id": <number>,
1574-
"result": <vim type>
1575-
"error": <dict>
1576-
}
1577-
1578-
A LSP notification message has the following format (expressed as a Vim Dict).
1579-
The "params" field is optional: >
1580-
1581-
{
1582-
"jsonrpc": "2.0",
1583-
"method": <string>,
1584-
"params": <list|dict>
1585-
}
1586-
1557+
<
15871558
vim:tw=78:ts=8:noet:ft=help:norl:

runtime/doc/cmdline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ Note: these are typed literally, they are not special keys!
936936
When the match is with a file name, it is expanded to the
937937
full path.
938938
*:<sfile>* *<sfile>*
939-
<sfile> When executing a ":source" command, is replaced with the
939+
<sfile> When executing a `:source` command, is replaced with the
940940
file name of the sourced file. *E498*
941941
When executing a legacy function, is replaced with the call
942942
stack, as with <stack> (this is for backwards
@@ -959,7 +959,7 @@ Note: these are typed literally, they are not special keys!
959959
defined.
960960
If the file name cannot be determined you get error *E1274* .
961961
*:<slnum>* *<slnum>*
962-
<slnum> When executing a ":source" command, is replaced with the
962+
<slnum> When executing a `:source` command, is replaced with the
963963
line number. *E842*
964964
When executing a function it's the line number relative to
965965
the start of the function.

runtime/doc/editing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ Examples: >
12251225

12261226
If you want to always use ":confirm", set the 'confirm' option.
12271227

1228-
*:browse* *:bro* *E338*
1228+
*:browse* *:bro* *E338*
12291229
:bro[wse] {command} Open a file selection dialog for an argument to
12301230
{command}. At present this works for |:e|, |:w|,
12311231
|:wall|, |:wq|, |:wqall|, |:x|, |:xall|, |:exit|,

runtime/doc/eval.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ You will not get an error if you try to change the type of a variable.
181181

182182

183183
1.2 Function references ~
184-
*Funcref* *E695* *E718* *E1192*
184+
*Funcref* *E695* *E718* *E1192*
185185
A Funcref variable is obtained with the |function()| function, the |funcref()|
186186
function, (in |Vim9| script) the name of a function, or created with the
187187
lambda expression |expr-lambda|. It can be used in an expression in the place
@@ -1289,7 +1289,7 @@ Generally, if a |List| index is equal to or higher than the length of the
12891289
error.
12901290

12911291

1292-
expr10[expr1a : expr1b] substring or sublist *expr-[:]*
1292+
expr10[expr1a : expr1b] substring or |sublist| *expr-[:]* *substring*
12931293

12941294
If expr10 is a String this results in the substring with the bytes or
12951295
characters from expr1a to and including expr1b. expr10 is used as a String,
@@ -3299,7 +3299,7 @@ text...
32993299

33003300
If "eval" is not specified, then each line of text is
33013301
used as a |literal-string|, except that single quotes
3302-
doe not need to be doubled.
3302+
does not need to be doubled.
33033303
If "eval" is specified, then any Vim expression in the
33043304
form {expr} is evaluated and the result replaces the
33053305
expression, like with |interp-string|.

runtime/doc/filetype.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ variables can be used to overrule the filetype used for certain extensions:
143143
*.asp g:filetype_asp |ft-aspvbs-syntax| |ft-aspperl-syntax|
144144
*.bas g:filetype_bas |ft-basic-syntax|
145145
*.cfg g:filetype_cfg
146-
*.csh g:filetype_csh |ft-csh-syntax|
146+
*.csh g:filetype_csh |ft-csh-syntax|
147147
*.dat g:filetype_dat
148148
*.frm g:filetype_frm |ft-form-syntax|
149149
*.fs g:filetype_fs |ft-forth-syntax|

runtime/doc/if_pyth.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -839,10 +839,10 @@ Raising SystemExit exception in python isn't endorsed way to quit vim, use: >
839839
:py vim.command("qall!")
840840
<
841841
*E1266*
842-
This error can occur when python 3 cannot load the required modules. This
843-
means that your python 3 is not correctly installed or there are some mistakes
842+
This error can occur when Python 3 cannot load the required modules. This
843+
means that your Python 3 is not correctly installed or there are some mistakes
844844
in your settings. Please check the following items:
845-
1. Make sure that python 3 is correctly installed. Also check the version of
845+
1. Make sure that Python 3 is correctly installed. Also check the version of
846846
python.
847847
2. Check the 'pythonthreedll' option.
848848
3. Check the 'pythonthreehome' option.
@@ -887,8 +887,8 @@ the runtime library cannot be found.
887887
==============================================================================
888888
11. Python X *python_x* *pythonx*
889889

890-
Because most python code can be written so that it works with python 2.6+ and
891-
python 3 the pyx* functions and commands have been written. They work exactly
890+
Because most python code can be written so that it works with Python 2.6+ and
891+
Python 3 the pyx* functions and commands have been written. They work exactly
892892
the same as the Python 2 and 3 variants, but select the Python version using
893893
the 'pyxversion' setting.
894894

runtime/doc/indent.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ The examples below assume a 'shiftwidth' of 4.
291291
<
292292
*cino-g*
293293
gN Place C++ scope declarations N characters from the indent of the
294-
block they are in. (default 'shiftwidth'). By default, a scope
294+
block they are in. (default 'shiftwidth'). By default, a scope
295295
declaration is "public:", "protected:" or "private:". This can
296296
be adjusted with the 'cinscopedecls' option.
297297

runtime/doc/map.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,16 +177,16 @@ Because it tries to unmap "@@ ", including the white space before the command
177177
separator "|". Other examples with trailing white space: >
178178
unmap @@
179179
unmap @@ # Vim9 script comment
180-
unmap @@ " legacy comment
180+
unmap @@ " legacy script comment
181181
182182
An error will be issued, which is very hard to identify, because the ending
183183
whitespace character in `unmap @@ ` is not visible.
184184

185185
A generic solution is to put the command separator "|" right after the mapped
186186
keys. After that white space and a comment may follow: >
187187
188-
unmap @@| # Vim9 scriptcomment
189-
unmap @@| " legacy scriptcomment
188+
unmap @@| # Vim9 script comment
189+
unmap @@| " legacy script comment
190190
191191
192192
1.2 SPECIAL ARGUMENTS *:map-arguments*
@@ -195,7 +195,8 @@ keys. After that white space and a comment may follow: >
195195
"<unique>" can be used in any order. They must appear right after the
196196
command, before any other arguments.
197197

198-
*:map-local* *:map-<buffer>* *:map-buffer* *E224* *E225*
198+
*:map-local* *:map-<buffer>* *:map-buffer*
199+
*E224* *E225*
199200
If the first argument to one of these commands is "<buffer>" the mapping will
200201
be effective in the current buffer only. Example: >
201202
:map <buffer> ,w /[.,;]<CR>

0 commit comments

Comments
 (0)