Skip to content

Commit a1fea82

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 8bb6902 + 7cba71d commit a1fea82

File tree

21 files changed

+638
-256
lines changed

21 files changed

+638
-256
lines changed

runtime/doc/autocmd.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 7.4. Last change: 2016 Jul 19
1+
*autocmd.txt* For Vim version 7.4. Last change: 2016 Jul 29
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1163,10 +1163,11 @@ name!
11631163
different from existing {event} names, as this
11641164
most likely will not do what you intended.
11651165

1166-
*:augroup-delete* *E367*
1166+
*:augroup-delete* *E367* *W19*
11671167
:aug[roup]! {name} Delete the autocmd group {name}. Don't use
11681168
this if there is still an autocommand using
1169-
this group! This is not checked.
1169+
this group! You will get a warning if doing
1170+
it anyway.
11701171

11711172
To enter autocommands for a specific group, use this method:
11721173
1. Select the group with ":augroup {name}".

runtime/doc/eval.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 7.4. Last change: 2016 Jul 31
1+
*eval.txt* For Vim version 7.4. Last change: 2016 Aug 02
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -262,7 +262,7 @@ it. To change a list in-place see |list-modification| below.
262262

263263

264264
Sublist ~
265-
265+
*sublist*
266266
A part of the List can be obtained by specifying the first and last index,
267267
separated by a colon in square brackets: >
268268
:let shortlist = mylist[2:-1] " get List [3, "four"]
@@ -990,10 +990,10 @@ Examples: >
990990
:let s = line(".")[4:] " from the fifth byte to the end
991991
:let s = s[:-3] " remove last two bytes
992992
<
993-
*sublist* *slice*
993+
*slice*
994994
If expr8 is a |List| this results in a new |List| with the items indicated by
995995
the indexes expr1a and expr1b. This works like with a String, as explained
996-
just above, except that indexes out of range cause an error. Examples: >
996+
just above. Also see |sublist| below. Examples: >
997997
:let l = mylist[:3] " first four items
998998
:let l = mylist[4:4] " List with one item
999999
:let l = mylist[:] " shallow copy of a List
@@ -8296,7 +8296,7 @@ See |:verbose-cmd| for more information.
82968296
: let x += 1
82978297
: return x
82988298
: endfunction
8299-
: return function('Bar')
8299+
: return funcref('Bar')
83008300
:endfunction
83018301
83028302
:let F = Foo()

runtime/doc/map.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*map.txt* For Vim version 7.4. Last change: 2016 Jul 06
1+
*map.txt* For Vim version 7.4. Last change: 2016 Jul 30
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1416,9 +1416,11 @@ The valid escape sequences are
14161416
<mods> The command modifiers, if specified. Otherwise, expands to
14171417
nothing. Supported modifiers are |:aboveleft|, |:belowright|,
14181418
|:botright|, |:browse|, |:confirm|, |:hide|, |:keepalt|,
1419-
|:keepjumps|, |:keepmarks|, |:keeppatterns|, |:lockmarks|,
1420-
|:noswapfile|, |:silent|, |:tab|, |:topleft|, |:verbose|, and
1421-
|:vertical|.
1419+
|:keepjumps|, |:keepmarks|, |:keeppatterns|, |:leftabove|,
1420+
|:lockmarks|, |:noswapfile| |:rightbelow|, |:silent|, |:tab|,
1421+
|:topleft|, |:verbose|, and |:vertical|.
1422+
Note that these are not yet supported: |:noautocmd|,
1423+
|:sandbox| and |:unsilent|.
14221424
Examples: >
14231425
command! -nargs=+ -complete=file MyEdit
14241426
\ for f in expand(<q-args>, 0, 1) |

runtime/doc/options.txt

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2631,7 +2631,8 @@ A jump table for the options with a short description can be found at |Q_op|.
26312631
{Vi: directory to put temp file in, defaults to "/tmp"}
26322632

26332633
*'display'* *'dy'*
2634-
'display' 'dy' string (default "")
2634+
'display' 'dy' string (default "", set to "truncate" in
2635+
|defaults.vim|)
26352636
global
26362637
{not in Vi}
26372638
Change the way text is displayed. This is comma separated list of

runtime/doc/starting.txt

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

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -980,7 +980,7 @@ This has the side effect of setting or resetting other options (see
980980
changed. This has the same effect like the value of 'compatible' had this
981981
value when starting Vim.
982982

983-
'compatible is NOT reset, and |defaults.vim| is not loaded:
983+
'compatible' is NOT reset, and |defaults.vim| is not loaded:
984984
- when Vim was started with the |-u| command line argument, especially with
985985
"-u NONE", or
986986
- when started with the |-C| command line argument, or

runtime/doc/tags

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
12491249
+job various.txt /*+job*
12501250
+jumplist various.txt /*+jumplist*
12511251
+keymap various.txt /*+keymap*
1252+
+lambda various.txt /*+lambda*
12521253
+langmap various.txt /*+langmap*
12531254
+libcall various.txt /*+libcall*
12541255
+linebreak various.txt /*+linebreak*
@@ -2013,6 +2014,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
20132014
:bmodified windows.txt /*:bmodified*
20142015
:bn windows.txt /*:bn*
20152016
:bnext windows.txt /*:bnext*
2017+
:bo windows.txt /*:bo*
20162018
:botright windows.txt /*:botright*
20172019
:bp windows.txt /*:bp*
20182020
:bprevious windows.txt /*:bprevious*
@@ -2305,6 +2307,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
23052307
:for eval.txt /*:for*
23062308
:fu eval.txt /*:fu*
23072309
:func-abort eval.txt /*:func-abort*
2310+
:func-closure eval.txt /*:func-closure*
23082311
:func-dict eval.txt /*:func-dict*
23092312
:func-range eval.txt /*:func-range*
23102313
:function eval.txt /*:function*
@@ -4516,6 +4519,8 @@ E929 starting.txt /*E929*
45164519
E93 windows.txt /*E93*
45174520
E930 eval.txt /*E930*
45184521
E931 message.txt /*E931*
4522+
E932 eval.txt /*E932*
4523+
E933 eval.txt /*E933*
45194524
E94 windows.txt /*E94*
45204525
E95 message.txt /*E95*
45214526
E96 diff.txt /*E96*
@@ -4796,6 +4801,7 @@ W15 repeat.txt /*W15*
47964801
W16 message.txt /*W16*
47974802
W17 arabic.txt /*W17*
47984803
W18 syntax.txt /*W18*
4804+
W19 autocmd.txt /*W19*
47994805
WORD motion.txt /*WORD*
48004806
WWW intro.txt /*WWW*
48014807
Win32 os_win32.txt /*Win32*
@@ -5392,6 +5398,7 @@ clipboard-unnamed options.txt /*clipboard-unnamed*
53925398
clipboard-unnamedplus options.txt /*clipboard-unnamedplus*
53935399
clojure-indent indent.txt /*clojure-indent*
53945400
close_cb channel.txt /*close_cb*
5401+
closure eval.txt /*closure*
53955402
cmd-key gui_mac.txt /*cmd-key*
53965403
cmd-movement gui_mac.txt /*cmd-movement*
53975404
cmd-shortcuts gui_mac.txt /*cmd-shortcuts*
@@ -5637,6 +5644,7 @@ debugger.txt debugger.txt /*debugger.txt*
56375644
dec-mouse options.txt /*dec-mouse*
56385645
decada_members ft_ada.txt /*decada_members*
56395646
deepcopy() eval.txt /*deepcopy()*
5647+
defaults.vim starting.txt /*defaults.vim*
56405648
definition-search tagsrch.txt /*definition-search*
56415649
definitions intro.txt /*definitions*
56425650
delete() eval.txt /*delete()*
@@ -6166,6 +6174,7 @@ ftplugin-name usr_05.txt /*ftplugin-name*
61666174
ftplugin-overrule filetype.txt /*ftplugin-overrule*
61676175
ftplugin-special usr_41.txt /*ftplugin-special*
61686176
ftplugins usr_05.txt /*ftplugins*
6177+
funcref() eval.txt /*funcref()*
61696178
function() eval.txt /*function()*
61706179
function-argument eval.txt /*function-argument*
61716180
function-key intro.txt /*function-key*

runtime/doc/todo.txt

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4. Last change: 2016 Jul 23
1+
*todo.txt* For Vim version 7.4. Last change: 2016 Aug 02
22

33

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

37+
Should free_all_functions(void) skip numbered and lambda functions?
38+
3739
+channel:
3840
- Channel test fails with Motif. Sometimes kills the X11 server.
3941
- When a message in the queue but there is no callback, drop it after a while?
@@ -108,15 +110,6 @@ Or avoid recursiveness.
108110
Patch to test popupmenu. Fails, possibly due to a bug.
109111
(Christian Brabandt, 2016 Jul 23)
110112

111-
7 In "-- INSERT (lang) --" show the name of the keymap used instead of
112-
"lang". (Ilya Dogolazky)
113-
Patch: Show keymap name in mode indicator (Dmitri Vereshchagin, 2016 Jul 19,
114-
#933)
115-
116-
Patch to fix the Problem using cgn to change a search hit when
117-
replacement includes hit. Reported by John Beckett, fix by Christian Brabandt,
118-
2016 Jan 11.
119-
120113
Once .exe with updated installer is available: Add remark to download page
121114
about /S and /D options (Ken Takata, 2016 Apr 13)
122115
Or point to nightly builds: https://github.com/vim/vim-win32-installer/releases
@@ -136,27 +129,31 @@ Javascript indent wrong after /* in single quoted string:
136129
Use ADDR_OTHER instead of ADDR_LINES for many more commands.
137130
Add tests for using number larger than number of lines in buffer.
138131

139-
Updating marks in quickfix list is broken. (Yegappan, 2016 Jul 18)
140-
141132
Invalid behavior with NULL list. (Nikolai Pavlov, #768)
142133

143134
For current Windows build .pdb file is missing. (Gabriele Fava, 2016 May 11)
144135
5)
145136

146-
Support closure for lambda? Ken Takata is working on it.
147-
Patch Jul 19. Still need test updates.
148-
149137
Problem with whitespace in errorformat. (Gerd Wachsmuth, 2016 May 15, #807)
150138

151139
Undo problem: "g-" doesn't go back, gets stuck. (Björn Linse, 2016 Jul 18)
152140

141+
Do we need some way (option) to show the sign column even when there are no
142+
signs? Patch by Christian Brabandt, 2016 Jul 29.
143+
153144
Patch to allow setting w:quickfix_title via setqflist() and setloclist()
154145
functions. (Christian Brabandt, 2013 May 8, update May 21)
155146
Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14)
156147
Second one. Update May 22.
157148
Update by Daniel Hahler, 2014 Jul 4, Aug 14, Oct 14, Oct 15.
158-
Rethink this: can we add an argument to setqflist() and getqflist() for these
159-
extra items?
149+
Updated patch: add an argument to setqflist() and getqflist() for these
150+
extra items: Yegappan, 2016 Jul 30.
151+
152+
Patch to detect st terminal supporting xterm mouse. (Manuel Schiller, 2016 Aug
153+
2, #963)
154+
155+
Syntax highlighting for messages with RFC3339 timestamp (#946)
156+
Did maintainer reply?
160157

161158
Patch to add filtering of the quickfix list. (Yegappan Lakshmanan, 2016 Mar
162159
13, last version) Update June 26, #830.
@@ -174,14 +171,33 @@ Cannot delete a file with square brackets with delete(). (#696)
174171
No autocommand for when changing directory. Patch from allen haim, 2016 Jun
175172
27, #888
176173
Justin M Keyes: use "global" or "window" for the pattern. Can add "tab"
177-
later.
174+
later. What if entering a window where ":lcd" was used?
175+
176+
Completion for input() does not expand environment variables. (chdiza, 2016
177+
Jul 25, #948)
178+
179+
Patch to have text objects defined by arbitrary single characters. (Daniel
180+
Thau, 2013 Nov 20, 2014 Jan 29, 2014 Jan 31)
181+
Ben Fritz: problem with 'selection' set to "exclusive".
182+
Updated to current Vim, not quite right yet. (Ben Fritz, 2014 Mar 27)
183+
Updated to current Vim (James McCoy, 2016 Jul 30, #958)
184+
Still a bit of work left.
185+
186+
Patch to add CTRL-N / CTRL-P while searching. (Christian Brabandt, 2016 Jul
187+
29)
188+
189+
's$^$\=capture("s/^//gn")' locks Vim in sandbox mode (#950)
190+
Patch by Christian Brabandt, 2016 Jul 27.
178191

179192
MS-Windows: use WS_HIDE instead of SW_SHOWMINNOACTIVE in os_win32.c?
180193
Otherwise task flickers in taskbar.
181194

182195
Should make ":@r" handle line continuation. (Cesar Romani, 2016 Jun 26)
183196
Also for ":@.".
184197

198+
Patch to make printf() convert to string for %s items. (Ken Takata, 2016 Aug
199+
1)
200+
185201
Repeating 'opfunc' in a function only works once. (Tarmean, 2016 Jul 15, #925)
186202

187203
Patch on issue #728 by Christian Brabandt, 2016 Apr 7. Update with test: Apr 8.
@@ -219,13 +235,19 @@ emoji_width table has only one entry.
219235
It's possible to add ",," to 'wildignore', an empty entry. Causes problems.
220236
Reject the value? #710.
221237

238+
Patch to fix increment/decrement not working properly when 'virtualedit' is
239+
set. (Hirohito Higashi, 2016 Aug 1, #923)
240+
222241
Patch to support strikethrough next to bold and italic. (Christian Brabandt,
223242
2013 Jul 30) Update from Ken Takata, 2013 Oct 12.
224243
Update mentioned by Christian, 2016 Apr 25.
225244
Update from Ken Takata, 2016 Jul 17.
226245

227246
Patch to improve cscope. (Adrian Kocis, #843)
228247

248+
Patch to add getbufinfo(), gettabinfo() and getwininfo(). (Yegappan
249+
Lakshmanan, 2016 Apr 2016) Update Jul 29. #833.
250+
229251
Patch for groovy multi-line comment highlighting. (Justin M. Keyes, 2016 May
230252
20 #644)
231253

@@ -298,9 +320,6 @@ Should use /usr/local/share/applications or /usr/share/applications.
298320
Or use $XDG_DATA_DIRS.
299321
Also need to run update-desktop-database (Kuriyama Kazunobu, 2015 Nov 4)
300322

301-
Patch to add getbufinfo(), gettabinfo() and getwininfo(). (Yegappan
302-
Lakshmanan, 2016 Apr 2016) Update Jun 8.
303-
304323
Access to uninitialized memory in match_backref() regexp_nda.c:4882
305324
(Dominique Pelle, 2015 Nov 6)
306325

@@ -623,6 +642,9 @@ Spell files use a latin single quote. Unicode also has another single quote:
623642
New OpenOffice spell files support this with ICONV. But they are not
624643
compatible with Vim spell files. The old files can no longer be downloaded.
625644

645+
xterm should be able to pass focus changes to Vim, so that Vim can check for
646+
buffers that changed. Perhaps in misc.c, function selectwindow().
647+
Xterm 224 supports it!
626648
Patch to make FocusGained and FocusLost work in modern terminals. (Hayaki
627649
Saito, 2013 Apr 24) Has a problem (email 2015 Jan 7).
628650
Update 2015 Jan 10.
@@ -866,11 +888,6 @@ In the ATTENTION message about an existing swap file, mention the name of the
866888
process that is running. It might actually be some other program, e.g. after
867889
a reboot.
868890

869-
Patch to have text objects defined by arbitrary single characters. (Daniel
870-
Thau, 2013 Nov 20, 2014 Jan 29, 2014 Jan 31)
871-
Ben Fritz: problem with 'selection' set to "exclusive".
872-
Updated to current Vim, not quite right yet. (Ben Fritz, 2014 Mar 27)
873-
874891
Patch to select the next or previous text object if there isn't one under the
875892
cursor. (Daniel Thau, 2013 Nov 20)
876893

@@ -892,9 +909,6 @@ Patch to make confirm() display colors. (Christian Brabandt, 2012 Nov 9)
892909

893910
Patch to add functions for signs. (Christian Brabandt, 2013 Jan 27)
894911

895-
Do we need some way (option) to show the sign column even when there are no
896-
signs? Patch by Christian Brabandt, 2013 Aug 22.
897-
898912
Patch to remove flicker from popup menu. (Yasuhiro Matsumoto, 2013 Aug 15)
899913

900914
Problem with refresh:always in completion. (Tyler Wade, 2013 Mar 17)
@@ -2265,10 +2279,6 @@ Patch for adding ":lscscope". (Navdeep Parhar, 2007 Apr 26; update 2008 Apr
22652279
tabs and the autocommand "autocmd BufWinLeave * mkview". (James Vega, 2007
22662280
Jun 18)
22672281

2268-
xterm should be able to pass focus changes to Vim, so that Vim can check for
2269-
buffers that changed. Perhaps in misc.c, function selectwindow().
2270-
Xterm 224 supports it!
2271-
22722282
When completing from another file that uses a different encoding completion
22732283
text has the wrong encoding. E.g., when 'encoding' is utf-8 and file is
22742284
latin1. Example from Gombault Damien, 2007 Mar 24.

runtime/doc/various.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*various.txt* For Vim version 7.4. Last change: 2016 Jul 09
1+
*various.txt* For Vim version 7.4. Last change: 2016 Jul 29
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -362,6 +362,7 @@ N *+insert_expand* |insert_expand| Insert mode completion
362362
m *+job* starting and stopping jobs |job|
363363
N *+jumplist* |jumplist|
364364
B *+keymap* |'keymap'|
365+
N *+lambda* |lambda| and |closure|
365366
B *+langmap* |'langmap'|
366367
N *+libcall* |libcall()|
367368
N *+linebreak* |'linebreak'|, |'breakat'| and |'showbreak'|

0 commit comments

Comments
 (0)