Skip to content

Commit 345efa0

Browse files
committed
Update runtime files
1 parent 065ee9a commit 345efa0

11 files changed

Lines changed: 362 additions & 147 deletions

File tree

runtime/doc/eval.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4. Last change: 2016 Jan 09
1+
*eval.txt* For Vim version 7.4. Last change: 2016 Jan 15
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3497,7 +3497,7 @@ getcmdwintype() *getcmdwintype()*
34973497
*getcurpos()*
34983498
getcurpos() Get the position of the cursor. This is like getpos('.'), but
34993499
includes an extra item in the list:
3500-
[bufnum, lnum, col, off, curswant]
3500+
[bufnum, lnum, col, off, curswant] ~
35013501
The "curswant" number is the preferred column when moving the
35023502
cursor vertically.
35033503
This can be used to save and restore the cursor position: >

runtime/doc/help.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*help.txt* For Vim version 7.4. Last change: 2016 Jan 09
1+
*help.txt* For Vim version 7.4. Last change: 2016 Jan 10
22

33
VIM - main help file
44
k
@@ -10,22 +10,22 @@ Close this window: Use ":q<Enter>".
1010
Jump to a subject: Position the cursor on a tag (e.g. |bars|) and hit CTRL-].
1111
With the mouse: ":set mouse=a" to enable the mouse (in xterm or GUI).
1212
Double-click the left mouse button on a tag, e.g. |bars|.
13-
Jump back: Type CTRL-T or CTRL-O (repeat to go further back).
13+
Jump back: Type CTRL-T or CTRL-O. Repeat to go further back.
1414

1515
Get specific help: It is possible to go directly to whatever you want help
1616
on, by giving an argument to the |:help| command.
17-
It is possible to further specify the context:
18-
*help-context*
17+
Prepend something to specify the context: *help-context*
18+
1919
WHAT PREPEND EXAMPLE ~
20-
Normal mode command (nothing) :help x
20+
Normal mode command :help x
2121
Visual mode command v_ :help v_u
2222
Insert mode command i_ :help i_<Esc>
2323
Command-line command : :help :quit
2424
Command-line editing c_ :help c_<Del>
2525
Vim command argument - :help -r
2626
Option ' :help 'textwidth'
2727
Regular expression / :help /[
28-
Also see |help-summary| for a verbose explanation.
28+
See |help-summary| for more contexts and an explanation.
2929

3030
Search for help: Type ":help word", then hit CTRL-D to see matching
3131
help entries for "word".

runtime/doc/map.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*map.txt* For Vim version 7.4. Last change: 2014 Dec 08
1+
*map.txt* For Vim version 7.4. Last change: 2016 Jan 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -483,7 +483,7 @@ internal code is written to the script file.
483483

484484

485485
1.6 SPECIAL CHARACTERS *:map-special-chars*
486-
*map_backslash*
486+
*map_backslash* *map-backslash*
487487
Note that only CTRL-V is mentioned here as a special character for mappings
488488
and abbreviations. When 'cpoptions' does not contain 'B', a backslash can
489489
also be used like CTRL-V. The <> notation can be fully used then |<>|. But
@@ -494,21 +494,21 @@ To map a backslash, or use a backslash literally in the {rhs}, the special
494494
sequence "<Bslash>" can be used. This avoids the need to double backslashes
495495
when using nested mappings.
496496

497-
*map_CTRL-C*
497+
*map_CTRL-C* *map-CTRL-C*
498498
Using CTRL-C in the {lhs} is possible, but it will only work when Vim is
499499
waiting for a key, not when Vim is busy with something. When Vim is busy
500500
CTRL-C interrupts/breaks the command.
501501
When using the GUI version on MS-Windows CTRL-C can be mapped to allow a Copy
502502
command to the clipboard. Use CTRL-Break to interrupt Vim.
503503

504-
*map_space_in_lhs*
504+
*map_space_in_lhs* *map-space_in_lhs*
505505
To include a space in {lhs} precede it with a CTRL-V (type two CTRL-Vs for
506506
each space).
507-
*map_space_in_rhs*
507+
*map_space_in_rhs* *map-space_in_rhs*
508508
If you want a {rhs} that starts with a space, use "<Space>". To be fully Vi
509509
compatible (but unreadable) don't use the |<>| notation, precede {rhs} with a
510510
single CTRL-V (you have to type CTRL-V two times).
511-
*map_empty_rhs*
511+
*map_empty_rhs* *map-empty-rhs*
512512
You can create an empty {rhs} by typing nothing after a single CTRL-V (you
513513
have to type CTRL-V two times). Unfortunately, you cannot do this in a vimrc
514514
file.
@@ -583,7 +583,7 @@ Upper and lowercase differences are ignored.
583583
It is not possible to put a comment after these commands, because the '"'
584584
character is considered to be part of the {lhs} or {rhs}.
585585

586-
*map_bar*
586+
*map_bar* *map-bar*
587587
Since the '|' character is used to separate a map command from the next
588588
command, you will have to do something special to include a '|' in {rhs}.
589589
There are three methods:
@@ -601,7 +601,7 @@ When 'b' is present in 'cpoptions', "\|" will be recognized as a mapping
601601
ending in a '\' and then another command. This is Vi compatible, but
602602
illogical when compared to other commands.
603603

604-
*map_return*
604+
*map_return* *map-return*
605605
When you have a mapping that contains an Ex command, you need to put a line
606606
terminator after it to have it executed. The use of <CR> is recommended for
607607
this (see |<>|). Example: >

runtime/doc/tags

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4903,6 +4903,8 @@ asm.vim syntax.txt /*asm.vim*
49034903
asm68k syntax.txt /*asm68k*
49044904
asmh8300.vim syntax.txt /*asmh8300.vim*
49054905
assert_equal() eval.txt /*assert_equal()*
4906+
assert_exception() eval.txt /*assert_exception()*
4907+
assert_fails() eval.txt /*assert_fails()*
49064908
assert_false() eval.txt /*assert_false()*
49074909
assert_true() eval.txt /*assert_true()*
49084910
at motion.txt /*at*
@@ -6923,9 +6925,13 @@ man.vim filetype.txt /*man.vim*
69236925
manual-copyright usr_01.txt /*manual-copyright*
69246926
map() eval.txt /*map()*
69256927
map-<SID> map.txt /*map-<SID>*
6928+
map-CTRL-C map.txt /*map-CTRL-C*
69266929
map-ambiguous map.txt /*map-ambiguous*
6930+
map-backslash map.txt /*map-backslash*
69276931
map-backtick tips.txt /*map-backtick*
6932+
map-bar map.txt /*map-bar*
69286933
map-comments map.txt /*map-comments*
6934+
map-empty-rhs map.txt /*map-empty-rhs*
69296935
map-error map.txt /*map-error*
69306936
map-examples map.txt /*map-examples*
69316937
map-keys-fails map.txt /*map-keys-fails*
@@ -6934,7 +6940,10 @@ map-modes map.txt /*map-modes*
69346940
map-multibyte map.txt /*map-multibyte*
69356941
map-overview map.txt /*map-overview*
69366942
map-precedence map.txt /*map-precedence*
6943+
map-return map.txt /*map-return*
69376944
map-self-destroy tips.txt /*map-self-destroy*
6945+
map-space_in_lhs map.txt /*map-space_in_lhs*
6946+
map-space_in_rhs map.txt /*map-space_in_rhs*
69386947
map-typing map.txt /*map-typing*
69396948
map-which-keys map.txt /*map-which-keys*
69406949
map.txt map.txt /*map.txt*

runtime/doc/todo.txt

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4. Last change: 2016 Jan 10
1+
*todo.txt* For Vim version 7.4. Last change: 2016 Jan 15
22

33

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

37-
/tmp/test_increment_new_style.patch.2
38-
3937
Regexp problems:
4038
- The regexp engines are not reentrant, causing havoc when interrupted by a
4139
remote expression or something else. Move global variables onto the stack
@@ -78,8 +76,6 @@ Regexp problems:
7876
matches the empty string. (Dominique Pelle, 2015 Oct 2, Nov 24)
7977
- Search for \\~ causes error E874.
8078

81-
Help to build with interfaces. (Ken Takata, 2015 Jan 5)
82-
8379
Need to try out instructions in INSSTALLpc.txt about how to install all
8480
interfaces and how to build Vim with them.
8581
Appveyor build with self-installing executable, includes getting most
@@ -101,8 +97,6 @@ Should use /usr/local/share/applications or /usr/share/applications.
10197
Or use $XDG_DATA_DIRS.
10298
Also need to run update-desktop-database (Kuriyama Kazunobu, 2015 Nov 4)
10399

104-
Patch to update the help summary. (Christian Brabandt, 2015 Jan 10)
105-
106100
Add has('crypt-blowfish') and has('crypt-blowfish2') (Smu Johnson)
107101

108102
Access to uninitialized memory in match_backref() regexp_nda.c:4882
@@ -123,19 +117,11 @@ Illegal memory access, requires ASAN to see. (Dominique Pelle, 2015 Jul 28)
123117

124118
Gvim: when both Tab and CTRL-I are mapped, use CTRL-I not for Tab.
125119

126-
Patch to fix "." after CTRL-A in Visual block mode. (Ozaki Kiichi, 2015 Oct
127-
24)
128-
129-
Patch to have CTRL-A and CTRL-X update the '[ and '] marks.
130-
(Yukihiro Nakadaira, 2015 Aug 23)
131-
132-
Patch for GVimExt building with VS2015. (Mike Williams, 2015 Jan 10)
133-
134120
Unexpected delay when using CTRL-O u. It's not timeoutlen.
135121
(Gary Johnson, 2015 Aug 28)
136122

137-
Instead of separately uploading patches to the ftp site, can we get them from
138-
github? This URL works:
123+
Instead of separately uploading patches to the ftp site, we can get them from
124+
github with a URL like this:
139125
https://github.com/vim/vim/compare/v7.4.920%5E...v7.4.920.diff
140126
Diff for version.c contains more context, can't skip a patch.
141127
>
@@ -148,6 +134,9 @@ set_color_count().
148134

149135
Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
150136

137+
Patch to fix cursor position in right-left mode with concealing.
138+
(Hirohito Higashi, 2016 Jan 13)
139+
151140
Plugin to use Vim in MANPAGER. Konfekt, PR #491
152141

153142
Using uninitialized memory. (Dominique Pelle, 2015 Nov 4)
@@ -161,8 +150,16 @@ Patch to recognize string slice for variable followed by colon.
161150
Patch to add debug backtrace. (Alberto Fanjul, 2015 Sep 27)
162151
Update 2016 Jan 2. Issue #433
163152

153+
Patch to gvim.nsi for appveyor build. (Ken Takata, 2016 Jan 12)
154+
155+
Patch to improve behavior of dead keys on MS-Windows. (John Wellesz, 2015 Aug
156+
25) https://github.com/vim/vim/pull/399.diff
157+
164158
Patch to make mzscheme (racket) interface work. (Yukihiro Nakadaira, 2015 Jan
165-
10) Doesn't work for me, need to build from source.
159+
10) Doesn't work for me, need to build from source. Include anyway?
160+
Additional patch by Ken Takata, 2016 Jan 13.
161+
Merged patch by Yasuhiro Nakadaira,, 2016 Jan 14.
162+
Update for INSSTALLpc.txt by Ken Takata, Jan 14.
166163

167164
MS-Windows: When editing a file with a leading space, writing it uses the
168165
wrong name. (Aram, 2014 Nov 7) Vim 7.4.
@@ -172,7 +169,7 @@ specifically? First try with the parens, then without.
172169

173170
Half-finished patch to fix the Problem using cgn to change a search hit when
174171
replacement includes hit. Reported by John Beckett, fix by Christian Brabandt,
175-
2015 Dec 14, Update Dec 15.
172+
2016 Jan 11.
176173

177174
Patch to fix pointer cast warning in VS2015. (Mike Williams, 2015 Dec 13)
178175
Patch to make building GVimExt with VS2015. (Mike Williams, 2015 Dec 13)
@@ -199,6 +196,10 @@ library: http://userguide.icu-project.org/boundaryanalysis
199196
When complete() first argument is before where insert started and 'backspace'
200197
is Vi compatible, the completion fails. (Hirohito Higashi, 2015 Feb 19)
201198

199+
Patch to fix bug in searchpair(). (Christian Brabandt, 2016 Jan 11)
200+
Problem reported by David Fishburn, using searchpair() with synID() used in
201+
the skip expression.
202+
202203
Test 44 fails when [[=A=]] is changed to [[=À=]]. Caused by getcmdline() not
203204
handling the 0x80 as a second byte correctly? (Dominique Pelle, 2015 Jun 10)
204205

@@ -339,9 +340,6 @@ When two SIGWINCH arrive very quickly, the second one may be lost.
339340

340341
Make comments in the test Makefile silent. (Kartik Agaram, 2014 Sep 24)
341342

342-
Patch to improve behavior of dead keys on MS-Windows. (John Wellesz, 2015 Aug
343-
25) https://github.com/vim/vim/pull/399.diff
344-
345343
Result of systemlist() does not show whether text ended in line break.
346344
(Bjorn Linse, 2014 Nov 27)
347345

0 commit comments

Comments
 (0)