Skip to content

Commit 7db8f6f

Browse files
committed
Updated runtime files.
1 parent 7fed5c1 commit 7db8f6f

File tree

14 files changed

+56
-59
lines changed

14 files changed

+56
-59
lines changed

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: 1 addition & 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

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
@@ -4951,6 +4951,7 @@ assert_equal() eval.txt /*assert_equal()*
49514951
assert_exception() eval.txt /*assert_exception()*
49524952
assert_fails() eval.txt /*assert_fails()*
49534953
assert_false() eval.txt /*assert_false()*
4954+
assert_match() eval.txt /*assert_match()*
49544955
assert_true() eval.txt /*assert_true()*
49554956
at motion.txt /*at*
49564957
atan() eval.txt /*atan()*
@@ -7104,6 +7105,7 @@ matchit-install usr_05.txt /*matchit-install*
71047105
matchlist() eval.txt /*matchlist()*
71057106
matchparen pi_paren.txt /*matchparen*
71067107
matchstr() eval.txt /*matchstr()*
7108+
matchstrpos() eval.txt /*matchstrpos()*
71077109
max() eval.txt /*max()*
71087110
mbyte-IME mbyte.txt /*mbyte-IME*
71097111
mbyte-XIM mbyte.txt /*mbyte-XIM*

runtime/doc/todo.txt

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -34,19 +34,16 @@ not be repeated below, unless there is extra information.
3434
*known-bugs*
3535
-------------------- Known bugs and current work -----------------------
3636

37-
assert_matches('pattern', value)
37+
Using free memory. (Dominique, 2016 Mar 27)
3838

3939
+channel:
40-
- When decoding json, don't read all the typeahead at once, use the reader
41-
properly.
4240
- When a message in the queue but there is no callback, drop it after a while?
4341
Add timestamp to queued messages and callbacks with ID, remove after a
4442
minute. Option to set the droptime.
4543
- Add remark about undo sync, is there a way to force it?
4644
- When starting a job, have an option to open the server socket, so we know
4745
the port, and pass it to the command with --socket-fd {nr}. (Olaf Dabrunz,
4846
Feb 9) How to do this on MS-Windows?
49-
- Make sure errors lead to a useful error msg. ["ex","foobar"]
5047
- For connection to server, a "keep open" flag would be useful. Retry
5148
connecting in the main loop with zero timeout.
5249
Later
@@ -56,19 +53,10 @@ Later
5653
Partial:
5754
- Maybe we also need VAR_PARTIAL support in if_mzsch.
5855

59-
Packages:
60-
- make package for editexisting, others?
61-
6256
Make it so that the window ID can be used where currently a window nr is used
6357

64-
Fix to support --nofork for Windows batch files. (Kevin Cantú, 2016 Feb 23,
65-
#658, #659) Also add "setlocal" at top of batch file?
66-
67-
Patch to add matchstrpos(). (Ozaki Kiichi, 2016 Feb 28)
68-
69-
Why does this: echo "a" . 1.1
70-
result in: a11
71-
Should recognize float (so long as it's not ".1.1").
58+
Patch to add "q" item to guifont. #720, Kim Brouer, 2016 Mar 29
59+
Better patch from Yasuhiro Matsumoto, 2016 Jan 4.
7260

7361
Patch to make tag jump work on function({expr}). (Hirohito Higashi, 2016 Mar
7462
25)
@@ -170,10 +158,13 @@ Reject the value? #710.
170158
Win32: patch to use 64 bit stat() if possible. (Ken Takata, 2014 May 12)
171159
More tests May 14. Update May 29. Update Aug 10.
172160
Now part of large file patches. (Ken Takata, 2016 Feb 1)
173-
Two patches now? New update Feb 24.
161+
Win64: Seek error in swap file for a very big file (3 Gbyte). Check storing
162+
pointer in long and seek offset in 64 bit var.
163+
Patches from Ken Takata might help (2014 Apr 17)
164+
Update 2016 Mar 28. Can include all parts into one dist patch.
174165

175166
Patch to support 64 bit ints for Number. (Ken Takata, 2016 Jan 21)
176-
Also in update of Feb 24?
167+
Update 2016 Mar 28.
177168

178169
After 7.5 is released:
179170
- Drop support for older MS-Windows systems, before XP.
@@ -267,7 +258,7 @@ https://gist.github.com/presuku/d3d6b230b9b6dcfc0477
267258
Patch to make the behavior of "w" more straightforward, but not Vi compatible.
268259
With a 'cpo' flag. (Christian Brabandt, 2016 Feb 8)
269260

270-
Patch to add optionproperties(). (Anton Lindqvist, 2016 Mar 26)
261+
Patch to add optionproperties(). (Anton Lindqvist, 2016 Mar 27)
271262

272263
Patch to add TagNotFound autocommand. (Anton Lindqvist, 2016 Feb 3)
273264

@@ -1926,10 +1917,6 @@ Win32: using "gvim --remote-tab-silent fname" sometimes gives an empty screen
19261917
with the more prompt. Caused by setting the guitablabel? (Thomas Michael
19271918
Engelke, 2007 Dec 20 - 2008 Jan 17)
19281919

1929-
Win64: Seek error in swap file for a very big file (3 Gbyte). Check storing
1930-
pointer in long and seek offset in 64 bit var.
1931-
Patches from Ken Takata might help (2014 Apr 17)
1932-
19331920
Win32: patch for fullscreen mode. (Liushaolin, 2008 April 17)
19341921

19351922
Win32: When 'shell' is bash shellescape() doesn't always do the right thing.
@@ -4863,7 +4850,7 @@ Searching:
48634850
lines 23 to 45? Or does this conflict with Ex range syntax?
48644851
8 Allow identical pairs in 'matchpairs'. Restrict the search to the current
48654852
line.
4866-
7 Allow longer pairs in 'matchpairs'. Use ~/vim/macros/matchit.vim as an
4853+
7 Allow longer pairs in 'matchpairs'. Use matchit.vim as an
48674854
example.
48684855
8 Make it possible to define the character that "%" checks for in
48694856
#if/#endif. For nmake it's !if/!endif.

runtime/doc/usr_05.txt

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

33
VIM USER MANUAL - by Bram Moolenaar
44

@@ -363,10 +363,9 @@ Example for Unix (assuming you didn't have a plugin directory yet): >
363363
364364
mkdir ~/.vim
365365
mkdir ~/.vim/plugin
366-
cp /usr/local/share/vim/vim60/macros/justify.vim ~/.vim/plugin
366+
cp /tmp/yourplugin.vim ~/.vim/plugin
367367
368-
That's all! Now you can use the commands defined in this plugin to justify
369-
text.
368+
That's all! Now you can use the commands defined in this plugin.
370369

371370
Instead of putting plugins directly into the plugin/ directory, you may
372371
better organize them by putting them into subdirectories under plugin/.

runtime/doc/usr_25.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*usr_25.txt* For Vim version 7.4. Last change: 2014 Oct 29
1+
*usr_25.txt* For Vim version 7.4. Last change: 2016 Mar 28
22

33
VIM USER MANUAL - by Bram Moolenaar
44

@@ -196,12 +196,16 @@ Vim has no built-in way of justifying text. However, there is a neat macro
196196
package that does the job. To use this package, execute the following
197197
command: >
198198
199-
:runtime macros/justify.vim
199+
:packadd justify
200+
201+
Or put this line in your |vimrc|: >
202+
203+
packadd! justify
200204
201205
This Vim script file defines a new visual command "_j". To justify a block of
202206
text, highlight the text in Visual mode and then execute "_j".
203207
Look in the file for more explanations. To go there, do "gf" on this name:
204-
$VIMRUNTIME/macros/justify.vim.
208+
$VIMRUNTIME/pack/dist/opt/justify/plugin/justify.vim.
205209

206210
An alternative is to filter the text through an external program. Example: >
207211

runtime/doc/usr_41.txt

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

33
VIM USER MANUAL - by Bram Moolenaar
44

@@ -891,6 +891,7 @@ Mappings: *mapping-functions*
891891

892892
Testing: *test-functions*
893893
assert_equal() assert that two expressions values are equal
894+
assert_match() assert that a pattern matches the value
894895
assert_false() assert that an expression is false
895896
assert_true() assert that an expression is true
896897
assert_exception() assert that a command throws an exception

runtime/pack/dist/opt/matchit/doc/matchit.txt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ For instructions on installing this file, type
44
:help matchit-install
55
inside Vim.
66

7-
For Vim version 6.3. Last change: 2007 Aug 29
7+
For Vim version 6.3. Last change: 2016 Mar 28
88

99

1010
VIM REFERENCE MANUAL by Benji Fisher
@@ -152,13 +152,10 @@ setting |b:match_skip|.
152152
==============================================================================
153153
2. Activation *matchit-activate*
154154

155-
You can use this script as a plugin, by copying it to your plugin directory.
156-
See |add-global-plugin| for instructions. You can also add a line to your
157-
|vimrc| file, such as >
158-
:source $VIMRUNTIME/macros/matchit.vim
159-
or >
160-
:runtime macros/matchit.vim
161-
Either way, the script should start working the next time you start up Vim.
155+
To use the matchit plugin add this line to your |vimrc|: >
156+
packadd! matchit
157+
158+
The script should start working the next time you start Vim.
162159

163160
(Earlier versions of the script did nothing unless a |buffer-variable| named
164161
|b:match_words| was defined. Even earlier versions contained autocommands

runtime/syntax/sh.vim

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
" Language: shell (sh) Korn shell (ksh) bash (sh)
33
" Maintainer: Charles E. Campbell <[email protected]>
44
" Previous Maintainer: Lennart Schultz <[email protected]>
5-
" Last Change: Feb 18, 2016
6-
" Version: 145
5+
" Last Change: Mar 12, 2016
6+
" Version: 146
77
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
88
" For options and settings, please use: :help ft-sh-syntax
99
" This file includes many ideas from Eric Brunet ([email protected])
@@ -185,7 +185,7 @@ endif
185185

186186
" Options: {{{1
187187
" ====================
188-
syn match shOption "\s\zs[-+][-_a-zA-Z0-9#]\+"
188+
syn match shOption "\s\zs[-+][-_a-zA-Z#@]\+"
189189
syn match shOption "\s\zs--[^ \t$`'"|);]\+"
190190

191191
" File Redirection Highlighted As Operators: {{{1
@@ -317,7 +317,8 @@ syn match shColon '^\s*\zs:'
317317

318318
" String And Character Constants: {{{1
319319
"================================
320-
syn match shNumber "-\=\<\d\+\>#\="
320+
syn match shNumber "\<\d\+\>#\="
321+
syn match shNumber "-\=\.\=\d\+\>#\="
321322
syn match shCtrlSeq "\\\d\d\d\|\\[abcfnrtv0]" contained
322323
if exists("b:is_bash")
323324
syn match shSpecial "\\\o\o\o\|\\x\x\x\|\\c[^"]\|\\[abefnrtv]" contained

runtime/syntax/tex.vim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
" Vim syntax file
22
" Language: TeX
33
" Maintainer: Charles E. Campbell <[email protected]>
4-
" Last Change: Feb 18, 2016
5-
" Version: 92
4+
" Last Change: Mar 07, 2016
5+
" Version: 93
66
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
77
"
88
" Notes: {{{1
@@ -296,7 +296,7 @@ syn match texTypeStyle "\\sc\>"
296296
syn match texTypeStyle "\\tt\>"
297297

298298
" Type Styles: attributes, commands, families, etc (LaTeX2E): {{{1
299-
if s:tex_conceal !~ 'b'
299+
if s:tex_conceal !~# 'b'
300300
syn match texTypeStyle "\\textbf\>"
301301
syn match texTypeStyle "\\textit\>"
302302
endif
@@ -541,7 +541,7 @@ if !exists("g:tex_no_math")
541541
syn match texOnlyMath "[_^]"
542542
endif
543543
syn match texSpecialChar "\^\^[0-9a-f]\{2}\|\^\^\S"
544-
if s:tex_conceal !~ 'S'
544+
if s:tex_conceal !~# 'S'
545545
syn match texSpecialChar '\\glq\>' contained conceal cchar=
546546
syn match texSpecialChar '\\grq\>' contained conceal cchar=
547547
syn match texSpecialChar '\\glqq\>' contained conceal cchar=

0 commit comments

Comments
 (0)