Skip to content

Commit 07ed537

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents d582d51 + 76db9e0 commit 07ed537

71 files changed

Lines changed: 522 additions & 302 deletions

Some content is hidden

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

.github/CODEOWNERS_vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ runtime/syntax/haml.vim @tpope
363363
runtime/syntax/hare.vim @rsaihe
364364
runtime/syntax/haskell.vim @coot
365365
runtime/syntax/hgcommit.vim @k-takata
366+
runtime/syntax/hollywood.vim @sodero
366367
runtime/syntax/html.vim @dkearns
367368
runtime/syntax/i3config.vim @hiqua
368369
runtime/syntax/icon.vim @dkearns

runtime/doc/builtin.txt

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*builtin.txt* For Vim version 9.0. Last change: 2022 Oct 21
1+
*builtin.txt* For Vim version 9.0. Last change: 2022 Nov 09
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -808,8 +808,10 @@ append({lnum}, {text}) *append()*
808808
{lnum} can be zero to insert a line before the first one.
809809
{lnum} is used like with |getline()|.
810810
Returns 1 for failure ({lnum} out of range or out of memory),
811-
0 for success. In |Vim9| script an invalid argument or
812-
negative number results in an error. Example: >
811+
0 for success. When {text} is an empty list zero is returned,
812+
no matter the value of {lnum}.
813+
In |Vim9| script an invalid argument or negative number
814+
results in an error. Example: >
813815
:let failed = append(line('$'), "# THE END")
814816
:let failed = append(0, ["Chapter 1", "the beginning"])
815817
@@ -837,7 +839,9 @@ appendbufline({buf}, {lnum}, {text}) *appendbufline()*
837839
If {buf} is not a valid buffer or {lnum} is not valid, an
838840
error message is given. Example: >
839841
:let failed = appendbufline(13, 0, "# THE START")
840-
<
842+
< However, when {text} is an empty list then no error is given
843+
for an invalid {lnum}, since {lnum} isn't actually used.
844+
841845
Can also be used as a |method| after a List, the base is
842846
passed as the second argument: >
843847
mylist->appendbufline(buf, lnum)
@@ -983,7 +987,7 @@ autocmd_add({acmds}) *autocmd_add()*
983987
let acmd.bufnr = 5
984988
let acmd.cmd = 'call BufEnterFunc()'
985989
call autocmd_add([acmd])
986-
990+
<
987991
Can also be used as a |method|: >
988992
GetAutocmdList()->autocmd_add()
989993
<
@@ -1319,7 +1323,8 @@ bufwinid({buf}) *bufwinid()*
13191323
13201324
echo "A window containing buffer 1 is " .. (bufwinid(1))
13211325
<
1322-
Only deals with the current tab page.
1326+
Only deals with the current tab page. See |win_findbuf()| for
1327+
finding more.
13231328

13241329
Can also be used as a |method|: >
13251330
FindBuffer()->bufwinid()
@@ -1587,7 +1592,7 @@ col({expr}) The result is a Number, which is the byte index of the column
15871592
column is one higher if the cursor is after the end of the
15881593
line. Also, when using a <Cmd> mapping the cursor isn't
15891594
moved, this can be used to obtain the column in Insert mode: >
1590-
:imap <F2> <Cmd>echo col(".")<CR>
1595+
:imap <F2> <Cmd>echowin col(".")<CR>
15911596
15921597
< Can also be used as a |method|: >
15931598
GetPos()->col()
@@ -2771,7 +2776,7 @@ flattennew({list} [, {maxdepth}]) *flattennew()*
27712776
float2nr({expr}) *float2nr()*
27722777
Convert {expr} to a Number by omitting the part after the
27732778
decimal point.
2774-
{expr} must evaluate to a |Float| or a Number.
2779+
{expr} must evaluate to a |Float| or a |Number|.
27752780
Returns 0 if {expr} is not a |Float| or a |Number|.
27762781
When the value of {expr} is out of range for a |Number| the
27772782
result is truncated to 0x7fffffff or -0x7fffffff (or when
@@ -7875,9 +7880,10 @@ setbufline({buf}, {lnum}, {text}) *setbufline()*
78757880
To insert lines use |appendbufline()|.
78767881
Any text properties in {lnum} are cleared.
78777882

7878-
{text} can be a string to set one line, or a list of strings
7879-
to set multiple lines. If the list extends below the last
7880-
line then those lines are added.
7883+
{text} can be a string to set one line, or a List of strings
7884+
to set multiple lines. If the List extends below the last
7885+
line then those lines are added. If the List is empty then
7886+
nothing is changed and zero is returned.
78817887

78827888
For the use of {buf}, see |bufname()| above.
78837889

@@ -8062,7 +8068,8 @@ setline({lnum}, {text}) *setline()*
80628068
When {lnum} is just below the last line the {text} will be
80638069
added below the last line.
80648070
{text} can be any type or a List of any type, each item is
8065-
converted to a String.
8071+
converted to a String. When {text} is an empty List then
8072+
nothing is changed and FALSE is returned.
80668073

80678074
If this succeeds, FALSE is returned. If this fails (most likely
80688075
because {lnum} is invalid) TRUE is returned.
@@ -10222,6 +10229,7 @@ win_move_separator({nr}, {offset}) *win_move_separator()*
1022210229
FALSE otherwise.
1022310230
This will fail for the rightmost window and a full-width
1022410231
window, since it has no separator on the right.
10232+
Only works for the current tab page. *E1308*
1022510233

1022610234
Can also be used as a |method|: >
1022710235
GetWinnr()->win_move_separator(offset)
@@ -10236,6 +10244,7 @@ win_move_statusline({nr}, {offset}) *win_move_statusline()*
1023610244
movement may be smaller than specified (e.g., as a consequence
1023710245
of maintaining 'winminheight'). Returns TRUE if the window can
1023810246
be found and FALSE otherwise.
10247+
Only works for the current tab page.
1023910248

1024010249
Can also be used as a |method|: >
1024110250
GetWinnr()->win_move_statusline(offset)

runtime/doc/channel.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ a close callback to the channel.
465465

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

runtime/doc/cmdline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ always be swapped then.
804804

805805
Count and Range *N:*
806806

807-
When giving a count before entering ":", this is translated into:
807+
When giving a count before entering ":", this is translated into: >
808808
:.,.+(count - 1)
809809
In words: The "count" lines at and after the cursor. Example: To delete
810810
three lines: >

runtime/doc/editing.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*editing.txt* For Vim version 9.0. Last change: 2022 Apr 16
1+
*editing.txt* For Vim version 9.0. Last change: 2022 Nov 02
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -583,7 +583,7 @@ END OF LINE AND END OF FILE *eol-and-eof*
583583
Vim has several options to control the file format:
584584
'fileformat' the <EOL> style: Unix, DOS, Mac
585585
'endofline' whether the last line ends with a <EOL>
586-
'endooffile' whether the file ends with a CTRL-Z
586+
'endoffile' whether the file ends with a CTRL-Z
587587
'fixendofline' whether to fix eol and eof
588588

589589
The first three values are normally detected automatically when reading the

runtime/doc/eval.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1965,7 +1965,7 @@ v:collate The current locale setting for collation order of the runtime
19651965
command.
19661966
See |multi-lang|.
19671967

1968-
*v:colornames*
1968+
*v:colornames*
19691969
v:colornames A dictionary that maps color names to hex color strings. These
19701970
color names can be used with the |highlight-guifg|,
19711971
|highlight-guibg|, and |highlight-guisp| parameters. Updating
@@ -3610,7 +3610,7 @@ this pending exception or command is discarded.
36103610
For examples see |throw-catch| and |try-finally|.
36113611

36123612

3613-
NESTING OF TRY CONDITIONALS *try-nesting*
3613+
NESTING OF TRY CONDITIONALS *try-nesting*
36143614

36153615
Try conditionals can be nested arbitrarily. That is, a complete try
36163616
conditional can be put into the try block, a catch clause, or the finally

runtime/doc/filetype.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ used.
571571
For example, to set the dialect to a default of "fblite" but still allow for
572572
any #lang directive overrides, use the following command: >
573573
574-
let g:freebasic_lang = "fblite"
574+
let g:freebasic_lang = "fblite"
575575
576576
577577
GIT COMMIT *ft-gitcommit-plugin*

runtime/doc/help.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ Programming language support ~
161161
|filetype.txt| settings done specifically for a type of file
162162
|quickfix.txt| commands for a quick edit-compile-fix cycle
163163
|ft_ada.txt| Ada (the programming language) support
164+
|ft_context.txt| Filetype plugin for ConTeXt
165+
|ft_mp.txt| Filetype plugin for METAFONT and MetaPost
164166
|ft_ps1.txt| Filetype plugin for Windows PowerShell
165167
|ft_raku.txt| Filetype plugin for Raku
166168
|ft_rust.txt| Filetype plugin for Rust

runtime/doc/os_haiku.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ additionally installed over the GUI version. Typical build commands are:
5656
./configure --prefix=`finddir B_SYSTEM_NONPACKAGED_DIRECTORY` \
5757
--datarootdir=`finddir B_SYSTEM_NONPACKAGED_DATA_DIRECTORY` \
5858
--mandir=`finddir B_SYSTEM_NONPACKAGED_DIRECTORY`/documentation/man \
59-
--with-tlib=ncurses \
59+
--with-tlib=ncurses
6060
make clean
6161
make install
6262

runtime/doc/pi_tar.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Copyright 2005-2017: *tar-copyright*
8282
<.vimrc> file.
8383
Default
8484
Variable Value Explanation
85-
*g:tar_browseoptions* "Ptf" used to get a list of contents
85+
*g:tar_browseoptions* "Ptf" used to get a list of contents
8686
*g:tar_readoptions* "OPxf" used to extract a file from a tarball
8787
*g:tar_cmd* "tar" the name of the tar program
8888
*g:tar_nomax* 0 if true, file window will not be maximized
@@ -98,7 +98,7 @@ Copyright 2005-2017: *tar-copyright*
9898
"-"
9999
Not all tar's support the "--" which is why
100100
it isn't default.
101-
*g:tar_writeoptions* "uf" used to update/replace a file
101+
*g:tar_writeoptions* "uf" used to update/replace a file
102102

103103

104104
==============================================================================

0 commit comments

Comments
 (0)