Skip to content

Commit ea2a2be

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 1f8072e + 55b6b60 commit ea2a2be

101 files changed

Lines changed: 2251 additions & 710 deletions

Some content is hidden

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

README_vim.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
<sub>For translations of this README see the end.</sub>
66

7+
If you find a bug or want to discuss the best way to add a new feature, please
8+
open an [issue](https://github.com/vim/vim/issues).
9+
If you have a question or want to discuss the best way to do something with
10+
Vim, you can use [StackExchange](https://vi.stackexchange.com/)
11+
or one of the [Maillists](https://www.vim.org/community.php).
12+
713

814
## What is Vim? ##
915

runtime/doc/autocmd.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ 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|.
5858
Here {event} cannot be "*". *E1155*
5959
Note: A quote character is seen as argument to the
6060
:autocmd and won't start a comment.

runtime/doc/change.txt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 8.2. Last change: 2021 Mar 01
1+
*change.txt* For Vim version 8.2. Last change: 2021 Jun 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1042,6 +1042,10 @@ inside of strings can change! Also see 'softtabstop' option. >
10421042
cursor to the end of line (which is more logical,
10431043
but not Vi-compatible) use ":map Y y$".
10441044

1045+
*zy*
1046+
["x]zy{motion} Yank {motion} text [into register x]. Only differs
1047+
from `y` when selecting a block of text, see |v_zy|.
1048+
10451049
*v_y*
10461050
{Visual}["x]y Yank the highlighted text [into register x] (for
10471051
{Visual} see |Visual-mode|).
@@ -1050,6 +1054,12 @@ inside of strings can change! Also see 'softtabstop' option. >
10501054
{Visual}["x]Y Yank the highlighted lines [into register x] (for
10511055
{Visual} see |Visual-mode|).
10521056

1057+
*v_zy*
1058+
{Visual}["x]zy Yank the highlighted text [into register x]. Trailing
1059+
whitespace at the end of each line of a selected block
1060+
won't be yanked. Especially useful in combination
1061+
with `zp`. (for {Visual} see |Visual-mode|)
1062+
10531063
*:y* *:yank* *E850*
10541064
:[range]y[ank] [x] Yank [range] lines [into register x]. Yanking to the
10551065
"* or "+ registers is possible only when the
@@ -1129,7 +1139,8 @@ inside of strings can change! Also see 'softtabstop' option. >
11291139
["x]zp or *zp* *zP*
11301140
["x]zP Like "p" and "P", except without adding trailing spaces
11311141
when pasting a block. Thus the inserted text will not
1132-
always be a rectangle.
1142+
always be a rectangle. Especially useful in
1143+
combination with |v_zy|.
11331144

11341145
You can use these commands to copy text from one place to another. Do this
11351146
by first getting the text into a register with a yank, delete or change

runtime/doc/eval.txt

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2102,7 +2102,7 @@ v:null An empty String. Used to put "null" in JSON. See
21022102
v:numbermax Maximum value of a number.
21032103

21042104
*v:numbermin* *numbermin-variable*
2105-
v:numbermin Minimum value of a number (negative)
2105+
v:numbermin Minimum value of a number (negative).
21062106

21072107
*v:numbersize* *numbersize-variable*
21082108
v:numbersize Number of bits in a Number. This is normally 64, but on some
@@ -2520,7 +2520,7 @@ char2nr({expr} [, {utf8}]) Number ASCII/UTF8 value of first char in {expr}
25202520
charclass({string}) Number character class of {string}
25212521
charcol({expr}) Number column number of cursor or mark
25222522
charidx({string}, {idx} [, {countcc}])
2523-
Number char index of byte {idx} in {string}
2523+
Number char index of byte {idx} in {string}
25242524
chdir({dir}) String change current working directory
25252525
cindent({lnum}) Number C indent for line {lnum}
25262526
clearmatches([{win}]) none clear all matches
@@ -2541,7 +2541,7 @@ cscope_connection([{num}, {dbpath} [, {prepend}]])
25412541
cursor({lnum}, {col} [, {off}])
25422542
Number move cursor to {lnum}, {col}, {off}
25432543
cursor({list}) Number move cursor to position in {list}
2544-
debugbreak({pid}) Number interrupt process being debugged
2544+
debugbreak({pid}) Number interrupt process being debugged
25452545
deepcopy({expr} [, {noref}]) any make a full copy of {expr}
25462546
delete({fname} [, {flags}]) Number delete the file or directory {fname}
25472547
deletebufline({expr}, {first} [, {last}])
@@ -4963,7 +4963,7 @@ funcref({name} [, {arglist}] [, {dict}])
49634963
Can also be used as a |method|: >
49644964
GetFuncname()->funcref([arg])
49654965
<
4966-
*function()* *E700* *E922* *E923*
4966+
*function()* *partial* *E700* *E922* *E923*
49674967
function({name} [, {arglist}] [, {dict}])
49684968
Return a |Funcref| variable that refers to function {name}.
49694969
{name} can be the name of a user defined function or an
@@ -5512,8 +5512,8 @@ getcurpos([{winid}])
55125512

55135513
Can also be used as a |method|: >
55145514
GetWinid()->getcurpos()
5515-
5516-
< *getcursorcharpos()*
5515+
<
5516+
*getcursorcharpos()*
55175517
getcursorcharpos([{winid}])
55185518
Same as |getcurpos()| but the column number in the returned
55195519
List is a character index instead of a byte index.
@@ -5522,8 +5522,8 @@ getcursorcharpos([{winid}])
55225522
With the cursor on '보' in line 3 with text "여보세요": >
55235523
getcursorcharpos() returns [0, 3, 2, 0, 3]
55245524
getcurpos() returns [0, 3, 4, 0, 3]
5525-
5526-
< Can also be used as a |method|: >
5525+
<
5526+
Can also be used as a |method|: >
55275527
GetWinid()->getcursorcharpos()
55285528

55295529
< *getcwd()*
@@ -5748,11 +5748,11 @@ getmarklist([{expr}]) *getmarklist()*
57485748
see |bufname()|.
57495749

57505750
Each item in the returned List is a |Dict| with the following:
5751-
name - name of the mark prefixed by "'"
5752-
pos - a |List| with the position of the mark:
5751+
mark name of the mark prefixed by "'"
5752+
pos a |List| with the position of the mark:
57535753
[bufnum, lnum, col, off]
5754-
Refer to |getpos()| for more information.
5755-
file - file name
5754+
Refer to |getpos()| for more information.
5755+
file file name
57565756

57575757
Refer to |getpos()| for getting information about a specific
57585758
mark.
@@ -5834,7 +5834,7 @@ getpos({expr}) Get the position for {expr}. For possible values of {expr}
58345834
'> is a large number.
58355835
The column number in the returned List is the byte position
58365836
within the line. To get the character position in the line,
5837-
use |getcharpos()|
5837+
use |getcharpos()|.
58385838
The column number can be very large, e.g. 2147483647, in which
58395839
case it means "after the end of the line".
58405840
This can be used to save and restore the position of a mark: >
@@ -7649,7 +7649,7 @@ matchfuzzypos({list}, {str} [, {dict}]) *matchfuzzypos()*
76497649
Same as |matchfuzzy()|, but returns the list of matched
76507650
strings, the list of character positions where characters
76517651
in {str} matches and a list of matching scores. You can
7652-
use |byteidx()|to convert a character position to a byte
7652+
use |byteidx()| to convert a character position to a byte
76537653
position.
76547654

76557655
If {str} matches multiple times in a string, then only the
@@ -9973,7 +9973,7 @@ sinh({expr}) *sinh()*
99739973
{only available when compiled with the |+float| feature}
99749974

99759975

9976-
slice({expr}, {start} [, {end}]) *slice()*
9976+
slice({expr}, {start} [, {end}]) *slice()*
99779977
Similar to using a |slice| "expr[start : end]", but "end" is
99789978
used exclusive. And for a string the indexes are used as
99799979
character indexes instead of byte indexes, like in

runtime/doc/filetype.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ For fish, add to the config file
632632
MARKDOWN *ft-markdown-plugin*
633633

634634
To enable folding use this: >
635-
let g:markdown_folding = 1
635+
let g:markdown_folding = 1
636636
<
637637

638638
PDF *ft-pdf-plugin*

runtime/doc/ft_raku.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Numbers, subscripts and superscripts are available with 's' and 'S':
4545
1s ₁ 1S ¹ ~
4646
2s ₂ 9S ⁹ ~
4747

48-
But some don´t come defined by default. Those are digraph definitions you can
48+
But some don't come defined by default. Those are digraph definitions you can
4949
add in your ~/.vimrc file. >
5050
exec 'digraph \\ '.char2nr('∖')
5151
exec 'digraph \< '.char2nr('≼')

runtime/doc/help.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Advanced editing ~
132132
|windows.txt| commands for using multiple windows and buffers
133133
|tabpage.txt| commands for using multiple tab pages
134134
|spell.txt| spell checking
135-
|diff.txt| working with two to four versions of the same file
135+
|diff.txt| working with two to eight versions of the same file
136136
|autocmd.txt| automatically executing commands on an event
137137
|eval.txt| expression evaluation, conditional commands
138138
|channel.txt| Jobs, Channels, inter-process communication
@@ -145,6 +145,7 @@ Special issues ~
145145
|term.txt| using different terminals and mice
146146
|terminal.txt| Terminal window support
147147
|popup.txt| popup window support
148+
|vim9.txt| using Vim9 script
148149

149150
Programming language support ~
150151
|indent.txt| automatic indenting for C and other languages
@@ -153,6 +154,8 @@ Programming language support ~
153154
|filetype.txt| settings done specifically for a type of file
154155
|quickfix.txt| commands for a quick edit-compile-fix cycle
155156
|ft_ada.txt| Ada (the programming language) support
157+
|ft_ps1.txt| Filetype plugin for Windows PowerShell
158+
|ft_raku.txt| Filetype plugin for Raku
156159
|ft_rust.txt| Filetype plugin for Rust
157160
|ft_sql.txt| about the SQL filetype plugin
158161

runtime/doc/index.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,7 @@ tag char note action in Normal mode ~
878878
|zv| zv open enough folds to view the cursor line
879879
|zw| zw permanently mark word as incorrectly spelled
880880
|zx| zx re-apply 'foldlevel' and do "zv"
881+
|zy| zy yank without trailing spaces
881882
|zz| zz redraw, cursor line at center of window
882883
|z<Left>| z<Left> same as "zh"
883884
|z<Right>| z<Right> same as "zl"

runtime/doc/motion.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*motion.txt* For Vim version 8.2. Last change: 2021 Mar 28
1+
*motion.txt* For Vim version 8.2. Last change: 2021 Jun 13
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -59,9 +59,14 @@ or change text. The following operators are available:
5959
|<| < shift left
6060
|zf| zf define a fold
6161
|g@| g@ call function set with the 'operatorfunc' option
62-
62+
*motion-count-multiplied*
6363
If the motion includes a count and the operator also had a count before it,
6464
the two counts are multiplied. For example: "2d3w" deletes six words.
65+
*operator-doubled*
66+
When doubling the operator it operates on a line. When using a count, before
67+
or after the first character, that many lines are operated upon. Thus `3dd`
68+
deletes three lines. A count before and after the first character is
69+
multiplied, thus `2y3y` yanks six lines.
6570

6671
After applying the operator the cursor is mostly left at the start of the text
6772
that was operated upon. For example, "yfe" doesn't move the cursor, but "yFe"

runtime/doc/options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.2. Last change: 2021 May 16
1+
*options.txt* For Vim version 8.2. Last change: 2021 May 31
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar

0 commit comments

Comments
 (0)