Skip to content

Commit 4d59b3c

Browse files
splhacksplhack
committed
Merge remote-tracking branch 'vim/master'
2 parents e6f9c44 + 7db8f6f commit 4d59b3c

20 files changed

+218
-121
lines changed

‎README.md

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,23 @@
77

88
## What is Vim? ##
99

10-
Vim is an almost compatible version of the UNIX editor Vi. Many new features
11-
have been added: multi-level undo, syntax highlighting, command line history,
12-
on-line help, spell checking, filename completion, block operations, etc.
13-
There is also a Graphical User Interface (GUI) available. See
14-
`runtime/doc/vi_diff.txt` for differences with Vi.
10+
Vim is a greatly improved version of the good old UNIX editor Vi. Many new
11+
features have been added: multi-level undo, syntax highlighting, command line
12+
history, on-line help, spell checking, filename completion, block operations,
13+
script language, etc. There is also a Graphical User Interface (GUI)
14+
available. Still, Vi compatibility is maintained, those who have Vi "in the
15+
fingers" will feel at home. See `runtime/doc/vi_diff.txt` for differences with
16+
Vi.
1517

1618
This editor is very useful for editing programs and other plain text files.
1719
All commands are given with normal keyboard characters, so those who can type
1820
with ten fingers can work very fast. Additionally, function keys can be
19-
defined by the user, and the mouse can be used.
21+
mapped to commands by the user, and the mouse can be used.
2022

21-
Vim runs under MS-DOS, MS-Windows (NT, 2000, XP, Vista, 7, 8, 10), Macintosh,
22-
VMS and almost all flavours of UNIX. Porting to other systems should not be
23-
very difficult. Older versions of Vim run on MS-Windows 95/98/Me, Amiga DOS,
24-
Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained.
23+
Vim runs under MS-Windows (NT, 2000, XP, Vista, 7, 8, 10), Macintosh, VMS and
24+
almost all flavours of UNIX. Porting to other systems should not be very
25+
difficult. Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me, Amiga
26+
DOS, Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained.
2527

2628

2729
## Distribution ##
@@ -39,9 +41,31 @@ want or must compile it yourself. Check http://www.vim.org/download.php for
3941
an overview of currently available distributions.
4042

4143

44+
## Compiling ##
45+
46+
If you obtained a binary distribution you don't need to compile Vim. If you
47+
obtained a source distribution, all the stuff for compiling Vim is in the
48+
`src` directory. See `src/INSTALL` for instructions.
49+
50+
51+
## Installation ##
52+
53+
See one of these files for system-specific instructions. Either in the
54+
READMEdir directory (in the repository) or the top directory (if you unpack an
55+
archive):
56+
57+
README_ami.txt Amiga
58+
README_unix.txt Unix
59+
README_dos.txt MS-DOS and MS-Windows
60+
README_mac.txt Macintosh
61+
README_vms.txt VMS
62+
63+
There are other `README_*.txt` files, depending on the distribution you used.
64+
65+
4266
## Documentation ##
4367

44-
The vim tutor is a one hour training course for beginners. Mostly it can be
68+
The Vim tutor is a one hour training course for beginners. Often it can be
4569
started as `vimtutor`. See `:help tutor` for more information.
4670

4771
The best is to use `:help` in Vim. If you don't have an executable yet, read
@@ -77,26 +101,6 @@ For the most recent information about sponsoring look on the Vim web site:
77101
http://www.vim.org/sponsor/
78102

79103

80-
## Compiling ##
81-
82-
If you obtained a binary distribution you don't need to compile Vim. If you
83-
obtained a source distribution, all the stuff for compiling Vim is in the
84-
`src` directory. See `src/INSTALL` for instructions.
85-
86-
87-
## Installation ##
88-
89-
See one of these files for system-specific instructions:
90-
91-
README_ami.txt Amiga
92-
README_unix.txt Unix
93-
README_dos.txt MS-DOS and MS-Windows
94-
README_mac.txt Macintosh
95-
README_vms.txt VMS
96-
97-
There are more `README_*.txt` files, depending on the distribution you used.
98-
99-
100104
## Contributing ##
101105

102106
If you would like to help making Vim better, see the [CONTRIBUTING.md](https://github.com/vim/vim/blob/master/CONTRIBUTING.md) file.

‎README.txt

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@ README.txt for version 7.4 of Vim: Vi IMproved.
33

44
WHAT IS VIM?
55

6-
Vim is an almost compatible version of the UNIX editor Vi. Many new features
7-
have been added: multi-level undo, syntax highlighting, command line history,
8-
on-line help, spell checking, filename completion, block operations, etc.
9-
There is also a Graphical User Interface (GUI) available. See
10-
"runtime/doc/vi_diff.txt" for differences with Vi.
6+
Vim is a greatly improved version of the good old UNIX editor Vi. Many new
7+
features have been added: multi-level undo, syntax highlighting, command line
8+
history, on-line help, spell checking, filename completion, block operations,
9+
script language, etc. There is also a Graphical User Interface (GUI)
10+
available. Still, Vi compatibility is maintained, those who have Vi "in the
11+
fingers" will feel at home. See "runtime/doc/vi_diff.txt" for differences with
12+
Vi.
1113

1214
This editor is very useful for editing programs and other plain text files.
1315
All commands are given with normal keyboard characters, so those who can type
1416
with ten fingers can work very fast. Additionally, function keys can be
15-
defined by the user, and the mouse can be used.
17+
mapped to commands by the user, and the mouse can be used.
1618

17-
Vim runs under MS-DOS, MS-Windows (NT, 2000, XP, Vista, 7, 8, 10), Macintosh,
18-
VMS and almost all flavours of UNIX. Porting to other systems should not be
19-
very difficult. Older versions of Vim run on MS-Windows 95/98/Me, Amiga DOS,
20-
Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained.
19+
Vim runs under MS-Windows (NT, 2000, XP, Vista, 7, 8, 10), Macintosh, VMS and
20+
almost all flavours of UNIX. Porting to other systems should not be very
21+
difficult. Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me, Amiga
22+
DOS, Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained.
2123

2224

2325
DISTRIBUTION
@@ -35,9 +37,31 @@ want or must compile it yourself. Check "http://www.vim.org/download.php" for
3537
an overview of currently available distributions.
3638

3739

40+
COMPILING
41+
42+
If you obtained a binary distribution you don't need to compile Vim. If you
43+
obtained a source distribution, all the stuff for compiling Vim is in the
44+
"src" directory. See src/INSTALL for instructions.
45+
46+
47+
INSTALLATION
48+
49+
See one of these files for system-specific instructions. Either in the
50+
READMEdir directory (in the repository) or the top directory (if you unpack an
51+
archive):
52+
53+
README_ami.txt Amiga
54+
README_unix.txt Unix
55+
README_dos.txt MS-DOS and MS-Windows
56+
README_mac.txt Macintosh
57+
README_vms.txt VMS
58+
59+
There are more README_*.txt files, depending on the distribution you used.
60+
61+
3862
DOCUMENTATION
3963

40-
The vim tutor is a one hour training course for beginners. Mostly it can be
64+
The Vim tutor is a one hour training course for beginners. Often it can be
4165
started as "vimtutor". See ":help tutor" for more information.
4266

4367
The best is to use ":help" in Vim. If you don't have an executable yet, read
@@ -74,23 +98,9 @@ For the most recent information about sponsoring look on the Vim web site:
7498
http://www.vim.org/sponsor/
7599

76100

77-
COMPILING
101+
CONTRIBUTING
78102

79-
If you obtained a binary distribution you don't need to compile Vim. If you
80-
obtained a source distribution, all the stuff for compiling Vim is in the
81-
"src" directory. See src/INSTALL for instructions.
82-
83-
84-
INSTALLATION
85-
86-
See one of these files for system-specific instructions:
87-
README_ami.txt Amiga
88-
README_unix.txt Unix
89-
README_dos.txt MS-DOS and MS-Windows
90-
README_mac.txt Macintosh
91-
README_vms.txt VMS
92-
93-
There are more README_*.txt files, depending on the distribution you used.
103+
If you would like to help making Vim better, see the CONTRIBUTING.md file.
94104

95105

96106
INFORMATION

‎runtime/doc/channel.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*channel.txt* For Vim version 7.4. Last change: 2016 Mar 26
1+
*channel.txt* For Vim version 7.4. Last change: 2016 Mar 28
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -616,6 +616,9 @@ See |job_setoptions()| and |ch_setoptions()|.
616616
"err_name": "/path/file" the name of the file or buffer to write to
617617
"err_buf": number the number of the buffer to write to
618618

619+
"block_write": number only for testing: pretend every other write to stdin
620+
will block
621+
619622

620623
Writing to a buffer ~
621624

‎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 7.4. Last change: 2016 Feb 16
1+
*editing.txt* For Vim version 7.4. Last change: 2016 Mar 28
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -393,7 +393,7 @@ These are the common ones:
393393
To avoid the special meaning of the wildcards prepend a backslash. However,
394394
on MS-Windows the backslash is a path separator and "path\[abc]" is still seen
395395
as a wildcard when "[" is in the 'isfname' option. A simple way to avoid this
396-
is to use "path\[[]abc]". Then the file "path[abc]" literally.
396+
is to use "path\[[]abc]", this matches the file "path\[abc]".
397397

398398
*starstar-wildcard*
399399
Expanding "**" is possible on Unix, Win32, Mac OS/X and a few other systems.

‎runtime/doc/eval.txt

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4. Last change: 2016 Mar 27
1+
*eval.txt* For Vim version 7.4. Last change: 2016 Mar 29
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2020,6 +2020,8 @@ matchlist( {expr}, {pat}[, {start}[, {count}]])
20202020
List match and submatches of {pat} in {expr}
20212021
matchstr( {expr}, {pat}[, {start}[, {count}]])
20222022
String {count}'th match of {pat} in {expr}
2023+
matchstrpos( {expr}, {pat}[, {start}[, {count}]])
2024+
List {count}'th match of {pat} in {expr}
20232025
max( {list}) Number maximum value of items in {list}
20242026
min( {list}) Number minimum value of items in {list}
20252027
mkdir( {name} [, {path} [, {prot}]])
@@ -5204,6 +5206,24 @@ matchstr({expr}, {pat}[, {start}[, {count}]]) *matchstr()*
52045206
:echo matchstr("testing", "ing", 5)
52055207
< result is "".
52065208
When {expr} is a |List| then the matching item is returned.
5209+
The type isn't changed, it's not necessarily a String.
5210+
5211+
matchstrpos({expr}, {pat}[, {start}[, {count}]]) *matchstrpos()*
5212+
Same as |matchstr()|, but return the matched string, the start
5213+
position and the end position of the match. Example: >
5214+
:echo matchstrpos("testing", "ing")
5215+
< results in ["ing", 4, 7].
5216+
When there is no match ["", -1, -1] is returned.
5217+
The {start}, if given, has the same meaning as for |match()|. >
5218+
:echo matchstrpos("testing", "ing", 2)
5219+
< results in ["ing", 4, 7]. >
5220+
:echo matchstrpos("testing", "ing", 5)
5221+
< result is ["", -1, -1].
5222+
When {expr} is a |List| then the matching item, the index
5223+
of first item where {pat} matches, the start position and the
5224+
end position of the match are returned. >
5225+
:echo matchstrpos([1, '__x'], '\a')
5226+
< result is ["x", 1, 2, 3].
52075227
The type isn't changed, it's not necessarily a String.
52085228

52095229
*max()*

‎runtime/doc/helphelp.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*helphelp.txt* For Vim version 7.4. Last change: 2016 Mar 26
1+
*helphelp.txt* For Vim version 7.4. Last change: 2016 Mar 28
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -263,7 +263,9 @@ The second one finds the English user manual, even when 'helplang' is set to
263263

264264
When using command-line completion for the ":help" command, the "@en"
265265
extension is only shown when a tag exists for multiple languages. When the
266-
tag only exists for English "@en" is omitted.
266+
tag only exists for English "@en" is omitted. When the first candidate has an
267+
"@ab" extension and it matches the first language in 'helplang' "@ab" is also
268+
omitted.
267269

268270
When using |CTRL-]| or ":help!" in a non-English help file Vim will try to
269271
find the tag in the same language. If not found then 'helplang' will be used

‎runtime/doc/os_beos.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*os_beos.txt* For Vim version 7.4. Last change: 2010 Aug 14
1+
*os_beos.txt* For Vim version 7.4. Last change: 2016 Mar 28
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -248,8 +248,9 @@ reality. Vim uses this mapping:
248248
Button 3 -> MiddleMouse.
249249

250250
If your mouse has fewer than 3 buttons you can provide your own mapping from
251-
mouse clicks with modifier(s) to other mouse buttons. See the file
252-
vim-5.x/macros/swapmous.vim for an example. |gui-mouse-mapping|
251+
mouse clicks with modifier(s) to other mouse buttons. See the swapmouse
252+
package for an example: |gui-mouse-mapping|
253+
$VIMRUNTIME/pack/dist/opt/swapmouse/plugin/swapmouse.vim
253254

254255

255256
12. Color names *beos-colors*

‎runtime/doc/repeat.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*repeat.txt* For Vim version 7.4. Last change: 2016 Mar 26
1+
*repeat.txt* For Vim version 7.4. Last change: 2016 Mar 27
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -260,7 +260,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
260260
Packages will be loaded only once. After this command
261261
it won't happen again. When the optional ! is added
262262
this command will load packages even when done before.
263-
An Error only causes sourcing the script where it
263+
An error only causes sourcing the script where it
264264
happens to be aborted, further plugins will be loaded.
265265
See |packages|.
266266

‎runtime/doc/tags

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5003,6 +5003,7 @@ assert_equal() eval.txt /*assert_equal()*
50035003
assert_exception() eval.txt /*assert_exception()*
50045004
assert_fails() eval.txt /*assert_fails()*
50055005
assert_false() eval.txt /*assert_false()*
5006+
assert_match() eval.txt /*assert_match()*
50065007
assert_true() eval.txt /*assert_true()*
50075008
at motion.txt /*at*
50085009
atan() eval.txt /*atan()*
@@ -7195,6 +7196,7 @@ matchit-install usr_05.txt /*matchit-install*
71957196
matchlist() eval.txt /*matchlist()*
71967197
matchparen pi_paren.txt /*matchparen*
71977198
matchstr() eval.txt /*matchstr()*
7199+
matchstrpos() eval.txt /*matchstrpos()*
71987200
max() eval.txt /*max()*
71997201
mbyte-IME mbyte.txt /*mbyte-IME*
72007202
mbyte-XIM mbyte.txt /*mbyte-XIM*

0 commit comments

Comments
 (0)