Skip to content

Commit 6fd087e

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 54e742c + 0346b79 commit 6fd087e

55 files changed

Lines changed: 743 additions & 349 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/autocmd.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 8.2. Last change: 2020 Dec 19
1+
*autocmd.txt* For Vim version 8.2. Last change: 2021 Jan 28
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -54,7 +54,8 @@ effects. Be careful not to destroy your text.
5454
:au[tocmd] [group] {event} {pat} [++once] [++nested] {cmd}
5555
Add {cmd} to the list of commands that Vim will
5656
execute automatically on {event} for a file matching
57-
{pat} |autocmd-patterns|.
57+
{pat} |autocmd-patterns|.
58+
Here {event} cannot be "*". *E1155*
5859
Note: A quote character is seen as argument to the
5960
:autocmd and won't start a comment.
6061
Vim always adds the {cmd} after existing autocommands,

runtime/doc/cmdline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*cmdline.txt* For Vim version 8.2. Last change: 2020 Dec 26
1+
*cmdline.txt* For Vim version 8.2. Last change: 2021 Jan 26
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1096,7 +1096,7 @@ Also see |`=|.
10961096
In the command-line window the command line can be edited just like editing
10971097
text in any window. It is a special kind of window, because you cannot leave
10981098
it in a normal way.
1099-
{not available when compiled without the |+cmdline_hist| feature}
1099+
{not available when compiled without the |+cmdwin| feature}
11001100

11011101

11021102
OPEN *c_CTRL-F* *q:* *q/* *q?*

runtime/doc/eval.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.2. Last change: 2021 Jan 22
1+
*eval.txt* For Vim version 8.2. Last change: 2021 Jan 31
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -293,13 +293,13 @@ is not available it returns zero or the default value you specify: >
293293

294294

295295
List concatenation ~
296-
296+
*list-concatenation*
297297
Two lists can be concatenated with the "+" operator: >
298298
:let longlist = mylist + [5, 6]
299299
:let mylist += [7, 8]
300300

301-
To prepend or append an item turn the item into a list by putting [] around
302-
it. To change a list in-place see |list-modification| below.
301+
To prepend or append an item, turn the item into a list by putting [] around
302+
it. To change a list in-place, refer to |list-modification| below.
303303

304304

305305
Sublist ~
@@ -3145,6 +3145,7 @@ append({lnum}, {text}) *append()*
31453145
text line below line {lnum} in the current buffer.
31463146
Otherwise append {text} as one text line below line {lnum} in
31473147
the current buffer.
3148+
Any type of item is accepted and converted to a String.
31483149
{lnum} can be zero to insert a line before the first one.
31493150
Returns 1 for failure ({lnum} out of range or out of memory),
31503151
0 for success. Example: >
@@ -9421,6 +9422,8 @@ setline({lnum}, {text}) *setline()*
94219422
{lnum} is used like with |getline()|.
94229423
When {lnum} is just below the last line the {text} will be
94239424
added below the last line.
9425+
{text} can be any type or a List of any type, each item is
9426+
converted to a String.
94249427

94259428
If this succeeds, FALSE is returned. If this fails (most likely
94269429
because {lnum} is invalid) TRUE is returned.

runtime/doc/hangulin.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Vim had built-in support for hangul, the Korean language, for users without
88
XIM (X Input Method). Since it didn't work well and was not maintained it was
99
removed in Vim 8.1.2327.
1010

11-
If you want this hangul input mehod you can go back to Vim 8.1.2326 or
11+
If you want this hangul input method you can go back to Vim 8.1.2326 or
1212
earlier. If you think this code is still useful and want to maintain it, make
1313
a patch to add it back. However, making it work with UTF-8 encoding would be
1414
best.

0 commit comments

Comments
 (0)