Skip to content

Commit a1a2788

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents c6e15ba + 0cdb72a commit a1a2788

18 files changed

+155
-58
lines changed

runtime/doc/channel.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*channel.txt* For Vim version 8.0. Last change: 2016 Dec 01
1+
*channel.txt* For Vim version 8.0. Last change: 2016 Dec 02
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -605,11 +605,11 @@ See |job_setoptions()| and |ch_setoptions()|.
605605
*job-close_cb*
606606
"close_cb": handler Callback for when the channel is closed. Same as
607607
"close_cb" on |ch_open()|, see |close_cb|.
608-
*job-exit_cb*
608+
*job-drop*
609609
"drop" Specifies when to drop messages. Same as "drop" on
610610
|ch_open()|, see |channel-drop|. For "auto" the
611611
exit_cb is not considered.
612-
612+
*job-exit_cb*
613613
"exit_cb": handler Callback for when the job ends. The arguments are the
614614
job and the exit status.
615615
Vim checks up to 10 times per second for jobs that

runtime/doc/cmdline.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,10 +1060,10 @@ There are several ways to leave the command-line window:
10601060
Insert and in Normal mode.
10611061
CTRL-C Continue in Command-line mode. The command-line under the
10621062
cursor is used as the command-line. Works both in Insert and
1063-
in Normal mode. ":close" also works. There is no redraw,
1064-
thus the window will remain visible.
1063+
in Normal mode. There is no redraw, thus the window will
1064+
remain visible.
10651065
:quit Discard the command line and go back to Normal mode.
1066-
":exit", ":xit" and CTRL-\ CTRL-N also work.
1066+
":close", ":exit", ":xit" and CTRL-\ CTRL-N also work.
10671067
:qall Quit Vim, unless there are changes in some buffer.
10681068
:qall! Quit Vim, discarding changes to any buffer.
10691069

runtime/doc/message.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*message.txt* For Vim version 8.0. Last change: 2016 Sep 01
1+
*message.txt* For Vim version 8.0. Last change: 2017 Jan 02
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -129,8 +129,9 @@ closed properly. Mostly harmless.
129129
Command too recursive
130130
131131
This happens when an Ex command executes an Ex command that executes an Ex
132-
command, etc. This is only allowed 200 times. When it's more there probably
133-
is an endless loop. Probably a |:execute| or |:source| command is involved.
132+
command, etc. The limit is 200 or the value of 'maxfuncdepth', whatever is
133+
larger. When it's more there probably is an endless loop. Probably a
134+
|:execute| or |:source| command is involved.
134135

135136
*E254* >
136137
Cannot allocate color {name}

runtime/doc/options.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.0. Last change: 2016 Nov 26
1+
*options.txt* For Vim version 8.0. Last change: 2017 Jan 02
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -5173,6 +5173,8 @@ A jump table for the options with a short description can be found at |Q_op|.
51735173
catches endless recursion. When using a recursive function with
51745174
more depth, set 'maxfuncdepth' to a bigger number. But this will use
51755175
more memory, there is the danger of failing when memory is exhausted.
5176+
Increasing this limit above 200 also changes the maximum for Ex
5177+
command resursion, see |E169|.
51765178
See also |:function|.
51775179

51785180
*'maxmapdepth'* *'mmd'* *E223*

runtime/doc/pi_logipat.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*logiPat.txt* Logical Patterns Jun 22, 2015
1+
*pi_logipat.txt* Logical Patterns Jun 22, 2015
22

33
Author: Charles E. Campbell <NdrOchip@ScampbellPfamily.AbizM>
44
Copyright: (c) 2004-2015 by Charles E. Campbell *logiPat-copyright*

runtime/doc/quickref.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*quickref.txt* For Vim version 8.0. Last change: 2016 Aug 21
1+
*quickref.txt* For Vim version 8.0. Last change: 2016 Dec 16
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1076,6 +1076,8 @@ Short explanation of each option: *option-list*
10761076
|c_<Up>| <Up>/<Down> recall older/newer command-line that starts
10771077
with current command
10781078
|c_<S-Up>| <S-Up>/<S-Down> recall older/newer command-line from history
1079+
|c_CTRL-G| CTRL-G next match when 'incsearch' is active
1080+
|c_CTRL-T| CTRL-T previous match when 'incsearch' is active
10791081
|:history| :his[tory] show older command-lines
10801082

10811083
Context-sensitive completion on the command-line:

runtime/doc/tags

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7025,6 +7025,7 @@ job-callback channel.txt /*job-callback*
70257025
job-channel-overview channel.txt /*job-channel-overview*
70267026
job-close_cb channel.txt /*job-close_cb*
70277027
job-control channel.txt /*job-control*
7028+
job-drop channel.txt /*job-drop*
70287029
job-err_cb channel.txt /*job-err_cb*
70297030
job-err_io channel.txt /*job-err_io*
70307031
job-exit_cb channel.txt /*job-exit_cb*
@@ -7160,7 +7161,6 @@ logiPat-man pi_logipat.txt /*logiPat-man*
71607161
logiPat-manual pi_logipat.txt /*logiPat-manual*
71617162
logiPat-operators pi_logipat.txt /*logiPat-operators*
71627163
logiPat-pattern pi_logipat.txt /*logiPat-pattern*
7163-
logiPat.txt pi_logipat.txt /*logiPat.txt*
71647164
long-lines version5.txt /*long-lines*
71657165
love intro.txt /*love*
71667166
lowercase change.txt /*lowercase*
@@ -7877,6 +7877,7 @@ php3.vim syntax.txt /*php3.vim*
78777877
phtml.vim syntax.txt /*phtml.vim*
78787878
pi_getscript.txt pi_getscript.txt /*pi_getscript.txt*
78797879
pi_gzip.txt pi_gzip.txt /*pi_gzip.txt*
7880+
pi_logipat.txt pi_logipat.txt /*pi_logipat.txt*
78807881
pi_netrw.txt pi_netrw.txt /*pi_netrw.txt*
78817882
pi_paren.txt pi_paren.txt /*pi_paren.txt*
78827883
pi_spec.txt pi_spec.txt /*pi_spec.txt*

runtime/doc/todo.txt

Lines changed: 76 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 8.0. Last change: 2016 Dec 01
1+
*todo.txt* For Vim version 8.0. Last change: 2017 Jan 02
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -36,10 +36,14 @@ there will not be repeated below, unless there is extra information.
3636
-------------------- Known bugs and current work -----------------------
3737

3838
+channel:
39+
- Try out background make plugin:
40+
https://github.com/AndrewVos/vim-make-background
3941
- Problem with stderr on Windows? (Vincent Rischmann, 2016 Aug 31, #1026)
4042
- Add 'cwd' argument to start_job(): directory to change to in the child.
4143
check for valid directory before forking.
4244
Part of patch for environment, Yasuhiro Matsumoto, #1160
45+
- When out_cb executes :sleep, the close_cb may be invoked. (Daniel Hahler,
46+
2016 Dec 11, #1320)
4347
- Implement |job-term| ?
4448
- Channel test fails with Motif. Sometimes kills the X11 server.
4549
- When a message in the queue but there is no callback, drop it after a while?
@@ -70,8 +74,8 @@ Regexp problems:
7074
- Issue 164: freeze on regexp search.
7175
- Ignorecase not handled properly for multi-byte characters. (Axel Bender,
7276
2013 Dec 11)
73-
- Using \@> and \?. (Brett Stahlman, 2013 Dec 21) Remark from Marcin Szamotulski
74-
Remark from Brett 2014 Jan 6 and 7.
77+
- Using \@> and \?. (Brett Stahlman, 2013 Dec 21) Remark from Marcin
78+
Szamotulski; Remark from Brett 2014 Jan 6 and 7.
7579
- NFA regexp doesn't handle \%<v correctly. (Ingo Karkat, 2014 May 12)
7680
- Does not work with NFA regexp engine:
7781
\%u, \%x, \%o, \%d followed by a composing character
@@ -105,28 +109,53 @@ Regexp problems:
105109
Make html indent file use javascript indent, now that it's not just cindent.
106110
#1220
107111

108-
Use __sun instead of sun define check. #1296
112+
Patch to fix completion of :filter command. (Ichizok, 2016 Dec 3, #1299)
109113

110114
Patch to use buffer id for system() and systemlist() (LemonBoy, 2016 Nov 7,
111115
#1240)
112116

117+
Concatenation with null string causes an error: 'a'[1:0] .. 'b'
118+
Might as well handle it like an empty string.
119+
113120
When using symbolic links, a package path will not be inserted at the right
114121
position in 'runtimepath'. (Dugan Chen, 2016 Nov 18)
115122

116123
json_encode(): should convert to utf-8. (Nikolai Pavlov, 2016 Jan 23)
117124
What if there is an invalid character?
118125

126+
Putting "k" early in 'complete' does not use dictionary first?
127+
(RubenGZ, 2016 Dec 10, #1316)
128+
patch proposed by Hirohito Higashi, 2016 Dec 11.
129+
130+
Patch to fix NULL pointer when sorting zero elements. (Dominique, 2016 Dec 15)
131+
132+
Patch to test float functions. (Dominique, 2016 Dec 16)
133+
134+
Patch to improve completion of :syntax command. (Dominique, 2016 Dec 12)
135+
136+
Patch to use IEMSG() in more places. (Dominique, 2016 Dec 27)
137+
138+
Patch to avoid ubsan warning for integer overflow. (Dominique, 2016 Dec 26)
139+
119140
Bug: ":earlier 100d" doesn't work after using undo file.
120141
(Pavol Juhas, 2016 Nov 15, #1254)
121142
Fix by Christian, but lacks a test.
143+
Test in testdir/test_undo.vim doesn't catch the problem.
122144
Test by Pavol Juhas, Nov 22.
145+
Patch with test (Pavol Juhas,, 2016 Dec 3, #1300)
123146

124147
Bug: Json with same key should not give internal error. (Lcd, 2016 Oct 26)
125148
Make dict_add give a duplicate key error.
126149

150+
Patch to make str2nr and str2float work with signed values.
151+
(Lemonbody, 2016 Dec 18, #1332)
152+
127153
Should json_encode()/json_decode() restrict recursiveness?
128154
Or avoid recursiveness.
129155

156+
Patch to fix UBSan error. Is this actually needed?
157+
(Yegappan, 2016 Dec 18)
158+
130159
Allow using json with empty key? Dict already has it.
131160

132161
Json string with trailing \u should be an error. (Lcd)
@@ -137,17 +166,55 @@ Patch to deal with changed configure events in GTK 3. (Jan Alexander Steffens,
137166
2016 Oct 23 #1193)
138167
Remarks from nuko8, 2016 Nov 2.
139168

169+
Patch to change order of compiler flags. (Yousong Zhou, 2016 Sep 19, #1100)
170+
171+
Patch to add command line completion for :cexpr commands. (Yegappan
172+
Lakshmanan, 2016 Dec 13)
173+
174+
Patch to avoid warnings for overflow. (Mike Williams, 2016 Dec 16)
175+
Update Dec 19.
176+
140177
Wrong diff highlighting with three files. (2016 Oct 20, #1186)
141178
Also get E749 on exit.
179+
Another example in #1309
180+
181+
Patch to fix vim_iswordp() works differently on chars <256 that are two bytes.
182+
Ozaki Kiichi, 2016 Dec 11.
183+
184+
When deleting a mark or register, leave a tombstone, so that it's also deleted
185+
when writing viminfo (and the delete was the most recent action). #1339
186+
187+
Relevant neovim patch:
188+
https://github.com/neovim/neovim/pull/5717
189+
test case:
190+
https://github.com/neovim/neovim/pull/5717#issuecomment-264845481
191+
Others:
192+
https://github.com/neovim/neovim/issues/5713#issuecomment-265136186
193+
https://github.com/neovim/neovim/pull/5737#issuecomment-266055165
142194

143195
Patch for better explanation of 'compatible' side effects.
144196
https://github.com/vim/vim/pull/1161/files
145197

198+
Patch to adjust marks when adding a new line to the end of buffer in diff
199+
mode. (James McCoy, 2016 Dec 14, #1329)
200+
201+
Suggestion to improve pt-br spell checking. (Marcelo D Montu, 2016 Dec 15,
202+
#1330)
203+
146204
Error in test_startup_utf8 on Solaris. (Danek Duvall, 2016 Aug 17)
147205

206+
Rule to use "^" for statusline does not work if a space is defined with
207+
highlighting for both stl and stlnc. Patch by Ken Hamada (itchyny, 2016 Dec 11)
208+
209+
8 "stl" and "stlnc" in 'fillchars' don't work for multi-byte characters.
210+
Patch by Christian Wellenbrock, 2013 Jul 5.
211+
148212
Screen updated delayed when using CTRL-O u in Insert mode.
149213
(Barlik, #1191) Perhaps because status message?
150214

215+
Patch to add buffer name argument to taglist().
216+
Ordering of tags in result of taglist call. (Duncan McDougall, #1194)
217+
151218
Patch to fix that empty first tab is not in session.
152219
(Hirohito Higashi, 2016 Nov 25, #1282)
153220

@@ -171,7 +238,7 @@ Use ADDR_OTHER instead of ADDR_LINES for many more commands.
171238
Add tests for using number larger than number of lines in buffer.
172239

173240
Patch to make v:shell_error writable. (Christian Brabandt, 2016 Sep 27)
174-
Is there another solution?
241+
Useful to restore it. Is there another solution?
175242

176243
On MS-Windows with 'clipboard' set to "unnamed" this doesn't work to double
177244
lines: :g/^/normal yyp On Unix it works OK. (Bryce Orgill, 2016 Nov 5)
@@ -235,10 +302,11 @@ execute() cannot be used with command completeion. (Daniel Hahler, 2016 Oct 1,
235302

236303
cmap using execute() has side effects. (Killthemule, 2016 Aug 17, #983)
237304

238-
Patch to change order of compiler flags. (Yousong Zhou, 2016 Sep 19, #1100)
239-
240305
Patch to order results from taglist(). (Duncan McDougall, 2016 Oct 25)
241306

307+
patch for 'spellcamelcase' option: spellcheck each CamelCased word.
308+
(Ben Tucker, 2016 Dec 2)
309+
242310
Patch for :pyx, run python commands depending on the supported version.
243311
(Marc Weber, update from Ken Takata, 2016 Sep 19)
244312

@@ -268,7 +336,7 @@ Patch to fix wrong encoding of error message on Cygwin/MSYS terminal.
268336
'hlsearch' interferes with a Conceal match. (Rom Grk, 2016 Aug 9)
269337

270338
Patch to add context information to quickfix/location list. (Yegappan
271-
Lakshmanan, 2016 Aug 25)
339+
Lakshmanan, 2016 Aug 25, #1012)
272340

273341
MS-Windows: use WS_HIDE instead of SW_SHOWMINNOACTIVE in os_win32.c?
274342
Otherwise task flickers in taskbar.
@@ -981,9 +1049,6 @@ Szamotulski, 2012 Nov 8)
9811049
Session file creation: 'autochdir' causes trouble. Keep it off until after
9821050
loading all files.
9831051

984-
8 "stl" and "stlnc" in 'fillchars' don't work for multi-byte characters.
985-
Patch by Christian Wellenbrock, 2013 Jul 5.
986-
9871052
MS-Windows resizing problems:
9881053
- Windows window on screen positioning: Patch by Yukihiro Nakadaira, 2012 Jun
9891054
20. Uses getWindowRect() instead of GetWindowPlacement()

runtime/doc/usr_22.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*usr_22.txt* For Vim version 8.0. Last change: 2012 Nov 15
1+
*usr_22.txt* For Vim version 8.0. Last change: 2016 Dec 13
22

33
VIM USER MANUAL - by Bram Moolenaar
44

@@ -93,7 +93,7 @@ browser. This is what you get: >
9393
o................Browsing with a Horizontal Split...........|netrw-o|
9494
p................Use Preview Window.........................|netrw-p|
9595
P................Edit in Previous Window....................|netrw-p|
96-
q................Listing Bookmarks and History..............|netrw-q|
96+
q................Listing Bookmarks and History..............|netrw-qb|
9797
r................Reversing Sorting Order....................|netrw-r|
9898
< (etc)
9999

runtime/doc/version8.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*version8.txt* For Vim version 8.0. Last change: 2016 Nov 06
1+
*version8.txt* For Vim version 8.0. Last change: 2016 Dec 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -181,6 +181,12 @@ Insert mode commands: ~
181181
|i_CTRL-G_U| CTRL-G U don't break undo with next cursor movement
182182

183183

184+
Cmdline mode commands: ~
185+
186+
|/_CTRL-G| CTRL-G move to the next match in 'incsearch' mode
187+
|/_CTRL-T| CTRL-T move to the previous match in 'incsearch' mode
188+
189+
184190
Options: ~
185191

186192
'belloff' do not ring the bell for these reasons

0 commit comments

Comments
 (0)