Skip to content

Commit a615fe7

Browse files
ichizokichizok
committed
Merge remote-tracking branch 'vim/master'
2 parents d1e7357 + 101d57b commit a615fe7

89 files changed

Lines changed: 2201 additions & 1168 deletions

Some content is hidden

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

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ If the maintainer does not respond, contact the vim-dev maillist.
6565

6666
# Translations
6767

68-
Translations of this CONTRIBUTING file:
69-
[Korean](https://github.com/cjw1359/opensource/blob/master/Vim/CONTRIBUTING_ko.md)
70-
7168
Translating messages and runtime files is very much appreciated! These things
7269
can be translated:
7370
* Messages in Vim, see [src/po/README.txt][1]

‎README_vim.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ If you would like to help making Vim better, see the
128128

129129
## Information ##
130130

131+
If you are on macOS, you can use [Macvim](https://macvim-dev.github.io/macvim/).
132+
131133
The latest news about Vim can be found on the Vim home page:
132134
https://www.vim.org/
133135

@@ -150,8 +152,3 @@ Send any other comments, patches, flowers and suggestions to:
150152

151153

152154
This is `README.md` for version 9.0 of Vim: Vi IMproved.
153-
154-
155-
## Translations of this README ##
156-
157-
[Korean](https://github.com/cjw1359/opensource/blob/master/Vim/README_ko.md)

‎runtime/doc/builtin.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5775,8 +5775,8 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
57755775
message will appear and the match will not be added. An ID
57765776
is specified as a positive integer (zero excluded). IDs 1, 2
57775777
and 3 are reserved for |:match|, |:2match| and |:3match|,
5778-
respectively. 3 is reserved for use by the
5779-
|matchparen|polugin.
5778+
respectively. 3 is reserved for use by the |matchparen|
5779+
plugin.
57805780
If the {id} argument is not specified or -1, |matchadd()|
57815781
automatically chooses a free ID.
57825782

@@ -7387,7 +7387,7 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
73877387
< When {stopline} is used and it is not zero this also implies
73887388
that the search does not wrap around the end of the file.
73897389
A zero value is equal to not giving the argument.
7390-
7390+
*E1285* *E1286* *E1287* *E1288* *E1289*
73917391
When the {timeout} argument is given the search stops when
73927392
more than this many milliseconds have passed. Thus when
73937393
{timeout} is 500 the search stops after half a second.
@@ -9233,6 +9233,7 @@ synIDattr({synID}, {what} [, {mode}]) *synIDattr()*
92339233
"underline" "1" if underlined
92349234
"undercurl" "1" if undercurled
92359235
"strike" "1" if strikethrough
9236+
"nocombine" "1" if nocombine
92369237

92379238
Returns an empty string on error.
92389239

‎runtime/doc/change.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -802,6 +802,8 @@ When the {string} starts with "\=" it is evaluated as an expression, see
802802
|sub-replace-expression|. You can use that for complex replacement or special
803803
characters.
804804

805+
The substitution is limited in recursion to 4 levels. *E1290*
806+
805807
Otherwise these characters in {string} have a special meaning:
806808
*:s%*
807809
When {string} is equal to "%" and '/' is included with the 'cpoptions' option,

‎runtime/doc/channel.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ The Netbeans interface also uses a channel. |netbeans|
2727
14. Using a prompt buffer |prompt-buffer|
2828
15. Language Server Protocol |language-server-protocol|
2929

30+
*E1277*
3031
{only when compiled with the |+channel| feature for channel stuff}
3132
You can check this with: `has('channel')`
3233
{only when compiled with the |+job| feature for job stuff}

‎runtime/doc/cmdline.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,6 +1147,8 @@ character that indicates the type of command-line being edited, see
11471147

11481148
Vim will be in Normal mode when the editor is opened, except when 'insertmode'
11491149
is set.
1150+
*E1292*
1151+
Once a command-line window is open it is not possible to open another one.
11501152

11511153
The height of the window is specified with 'cmdwinheight' (or smaller if there
11521154
is no room). The window is always full width and is positioned just above the

‎runtime/doc/doctags.c‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ main(int argc, char **argv)
2121
char *p1, *p2;
2222
char *p;
2323
FILE *fd;
24+
int len;
25+
int in_example;
2426

2527
if (argc <= 1)
2628
{
@@ -37,22 +39,28 @@ main(int argc, char **argv)
3739
fprintf(stderr, "Unable to open %s for reading\n", argv[0]);
3840
continue;
3941
}
42+
in_example = 0;
4043
while (fgets(line, LINELEN, fd) != NULL)
4144
{
42-
p1 = strchr(line, '*'); /* find first '*' */
45+
if (in_example)
46+
{
47+
// skip over example; non-blank in first column ends example
48+
if (strchr(" \t\n\r", line[0]) != NULL)
49+
continue;
50+
in_example = 0;
51+
}
52+
p1 = strchr(line, '*'); // find first '*'
4353
while (p1 != NULL)
4454
{
45-
p2 = strchr(p1 + 1, '*'); /* find second '*' */
46-
if (p2 != NULL && p2 > p1 + 1) /* skip "*" and "**" */
55+
p2 = strchr(p1 + 1, '*'); // find second '*'
56+
if (p2 != NULL && p2 > p1 + 1) // skip "*" and "**"
4757
{
4858
for (p = p1 + 1; p < p2; ++p)
4959
if (*p == ' ' || *p == '\t' || *p == '|')
5060
break;
51-
/*
52-
* Only accept a *tag* when it consists of valid
53-
* characters, there is white space before it and is
54-
* followed by a white character or end-of-line.
55-
*/
61+
// Only accept a *tag* when it consists of valid
62+
// characters, there is white space before it and is
63+
// followed by a white character or end-of-line.
5664
if (p == p2
5765
&& (p1 == line || p1[-1] == ' ' || p1[-1] == '\t')
5866
&& (strchr(" \t\n\r", p[1]) != NULL
@@ -63,18 +71,22 @@ main(int argc, char **argv)
6371
printf("%s\t%s\t/*", p1, argv[0]);
6472
while (*p1)
6573
{
66-
/* insert backslash before '\\' and '/' */
74+
// insert backslash before '\\' and '/'
6775
if (*p1 == '\\' || *p1 == '/')
6876
putchar('\\');
6977
putchar(*p1);
7078
++p1;
7179
}
7280
printf("*\n");
73-
p2 = strchr(p2 + 1, '*'); /* find next '*' */
81+
p2 = strchr(p2 + 1, '*'); // find next '*'
7482
}
7583
}
7684
p1 = p2;
7785
}
86+
len = strlen(line);
87+
if ((len == 2 && strcmp(&line[len - 2], ">\n") == 0)
88+
|| (len >= 3 && strcmp(&line[len - 3], " >\n") == 0))
89+
in_example = 1;
7890
}
7991
fclose(fd);
8092
}

‎runtime/doc/eval.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ parenthesis), or any expression in parentheses: >
13991399
base->alist[idx](args)
14001400
base->(getFuncRef())(args)
14011401
Note that in the last call the base is passed to the function resulting from
1402-
"(getFuncRef())", inserted before "args".
1402+
"(getFuncRef())", inserted before "args". *E1275*
14031403

14041404
*E274*
14051405
"->name(" must not contain white space. There can be white space before the
@@ -1559,7 +1559,7 @@ allowing the inclusion of Vim script expressions (see |expr1|). Any
15591559
expression returning a value can be enclosed between curly braces. The value
15601560
is converted to a string. All the text and results of the expressions
15611561
are concatenated to make a new string.
1562-
*E1278*
1562+
*E1278* *E1279*
15631563
To include an opening brace '{' or closing brace '}' in the string content
15641564
double it. For double quoted strings using a backslash also works. A single
15651565
closing brace '}' will result in an error.
@@ -2694,7 +2694,7 @@ See |:verbose-cmd| for more information.
26942694
Define a new function by the name {name}. The body of
26952695
the function follows in the next lines, until the
26962696
matching |:endfunction|.
2697-
2697+
*E1267*
26982698
The name must be made of alphanumeric characters and
26992699
'_', and must start with a capital or "s:" (see
27002700
above). Note that using "b:" or "g:" is not allowed.

‎runtime/doc/options.txt‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,12 +1765,15 @@ A jump table for the options with a short description can be found at |Q_op|.
17651765

17661766
*'cmdheight'* *'ch'*
17671767
'cmdheight' 'ch' number (default 1)
1768-
global
1768+
global or local to tab page
17691769
Number of screen lines to use for the command-line. Helps avoiding
17701770
|hit-enter| prompts.
17711771
The value of this option is stored with the tab page, so that each tab
17721772
page can have a different value.
17731773

1774+
When 'cmdheight' is zero, there is no command-line unless it is being
1775+
used. Any messages will cause the |hit-enter| prompt.
1776+
17741777
*'cmdwinheight'* *'cwh'*
17751778
'cmdwinheight' 'cwh' number (default 7)
17761779
global
@@ -6578,9 +6581,11 @@ A jump table for the options with a short description can be found at |Q_op|.
65786581
45% relative position in the file
65796582
If 'rulerformat' is set, it will determine the contents of the ruler.
65806583
Each window has its own ruler. If a window has a status line, the
6581-
ruler is shown there. Otherwise it is shown in the last line of the
6582-
screen. If the statusline is given by 'statusline' (i.e. not empty),
6583-
this option takes precedence over 'ruler' and 'rulerformat'
6584+
ruler is shown there. If a window doesn't have a status line and
6585+
'cmdheight' is zero, the ruler is not shown. Otherwise it is shown in
6586+
the last line of the screen. If the statusline is given by
6587+
'statusline' (i.e. not empty), this option takes precedence over
6588+
'ruler' and 'rulerformat'.
65846589
If the number of characters displayed is different from the number of
65856590
bytes in the text (e.g., for a TAB or a multibyte character), both
65866591
the text column (byte number) and the screen column are shown,
@@ -7230,6 +7235,7 @@ A jump table for the options with a short description can be found at |Q_op|.
72307235
|+cmdline_info| feature}
72317236
Show (partial) command in the last line of the screen. Set this
72327237
option off if your terminal is slow.
7238+
The option has no effect when 'cmdheight' is zero.
72337239
In Visual mode the size of the selected area is shown:
72347240
- When selecting characters within a line, the number of characters.
72357241
If the number of bytes is different it is also displayed: "2-6"
@@ -7279,6 +7285,7 @@ A jump table for the options with a short description can be found at |Q_op|.
72797285
If in Insert, Replace or Visual mode put a message on the last line.
72807286
Use the 'M' flag in 'highlight' to set the type of highlighting for
72817287
this message.
7288+
The option has no effect when 'cmdheight' is zero.
72827289
When |XIM| may be used the message will include "XIM". But this
72837290
doesn't mean XIM is really active, especially when 'imactivatekey' is
72847291
not set.

‎runtime/doc/pattern.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ $ At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
928928
becomes invalid. Vim doesn't automatically update the matches.
929929
Similar to moving the cursor for "\%#" |/\%#|.
930930

931-
*/\%l* */\%>l* */\%<l* *E951* *E1204*
931+
*/\%l* */\%>l* */\%<l* *E951* *E1204* *E1273*
932932
\%23l Matches in a specific line.
933933
\%<23l Matches above a specific line (lower line number).
934934
\%>23l Matches below a specific line (higher line number).

0 commit comments

Comments
 (0)