Skip to content

Commit 8ea3524

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 5faeb08 + e4963c5 commit 8ea3524

50 files changed

Lines changed: 1912 additions & 572 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

nsis/gvim.nsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,8 @@ Section "$(str_section_exe)" id_section_exe
379379
File ${VIMRT}\pack\dist\opt\matchit\doc\*.*
380380
SetOutPath $0\pack\dist\opt\matchit\plugin
381381
File ${VIMRT}\pack\dist\opt\matchit\plugin\*.*
382+
SetOutPath $0\pack\dist\opt\matchit\autoload
383+
File ${VIMRT}\pack\dist\opt\matchit\autoload\*.*
382384

383385
SetOutPath $0\pack\dist\opt\shellmenu\plugin
384386
File ${VIMRT}\pack\dist\opt\shellmenu\plugin\*.*

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 8.1. Last change: 2019 Feb 16
1+
*eval.txt* For Vim version 8.1. Last change: 2019 Feb 22
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2893,9 +2893,9 @@ assert_false({actual} [, {msg}]) *assert_false()*
28932893
"Expected False but got {actual}" is produced.
28942894

28952895
assert_inrange({lower}, {upper}, {actual} [, {msg}]) *assert_inrange()*
2896-
This asserts number values. When {actual} is lower than
2897-
{lower} or higher than {upper} an error message is added to
2898-
|v:errors|. Also see |assert-return|.
2896+
This asserts number and |Float| values. When {actual} is lower
2897+
than {lower} or higher than {upper} an error message is added
2898+
to |v:errors|. Also see |assert-return|.
28992899
When {msg} is omitted an error in the form
29002900
"Expected range {lower} - {upper}, but got {actual}" is
29012901
produced.
@@ -5151,7 +5151,7 @@ gettabinfo([{arg}]) *gettabinfo()*
51515151
tabnr tab page number.
51525152
variables a reference to the dictionary with
51535153
tabpage-local variables
5154-
windows List of |window-ID|s in the tag page.
5154+
windows List of |window-ID|s in the tab page.
51555155

51565156
gettabvar({tabnr}, {varname} [, {def}]) *gettabvar()*
51575157
Get the value of a tab-local variable {varname} in tab page

runtime/doc/indent.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*indent.txt* For Vim version 8.1. Last change: 2019 Jan 31
1+
*indent.txt* For Vim version 8.1. Last change: 2019 Feb 21
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -948,6 +948,11 @@ can sometimes be slow, thus it timeouts after 150 msec. If you notice the
948948
indenting isn't correct, you can set a larger timeout in msec: >
949949
let g:pyindent_searchpair_timeout = 500
950950
951+
If looking back for unclosed parenthesis is still too slow, especially during
952+
a copy-paste operation, or if you don't need indenting inside multi-line
953+
parentheses, you can completely disable this feature: >
954+
let g:pyindent_disable_parentheses_indenting = 1
955+
951956
952957
R *ft-r-indent*
953958

runtime/doc/index.txt

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*index.txt* For Vim version 8.1. Last change: 2019 Jan 17
1+
*index.txt* For Vim version 8.1. Last change: 2019 Feb 22
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -17,9 +17,11 @@ to look for deleting something, use: "/delete".
1717
2.3. Square bracket commands |[|
1818
2.4. Commands starting with 'g' |g|
1919
2.5. Commands starting with 'z' |z|
20+
2.6. Operator-pending mode |operator-pending-index|
2021
3. Visual mode |visual-index|
2122
4. Command-line editing |ex-edit-index|
22-
5. EX commands |ex-cmd-index|
23+
5. Terminal-Job mode |terminal-job-index|
24+
6. EX commands |ex-cmd-index|
2325

2426
For an overview of options see help.txt |option-list|.
2527
For an overview of built-in functions see |functions|.
@@ -166,6 +168,20 @@ commands in CTRL-X submode *i_CTRL-X_index*
166168
|i_CTRL-X_s| CTRL-X s spelling suggestions
167169
{not available when compiled without the |+insert_expand| feature}
168170

171+
commands in completion mode (see |popupmenu-keys|)
172+
173+
|complete_CTRL-E| CTRL-E stop completion and go back to original text
174+
|complete_CTRL-Y| CTRL-Y accept selected match and stop completion
175+
CTRL-L insert one character from the current match
176+
<CR> insert currently selected match
177+
<BS> delete one character and redo search
178+
CTRL-H same as <BS>
179+
<Up> select the previous match
180+
<Down> select the next match
181+
<PageUp> select a match several entries back
182+
<PageDown> select a match several entries forward
183+
other stop completion and insert the typed character
184+
169185
==============================================================================
170186
2. Normal mode *normal-index*
171187

@@ -854,6 +870,17 @@ tag char note action in Normal mode ~
854870
|z<Left>| z<Left> same as "zh"
855871
|z<Right>| z<Right> same as "zl"
856872

873+
==============================================================================
874+
2.6 Operator-pending mode *operator-pending-index*
875+
876+
These can be used after an operator, but before a {motion} has been entered.
877+
878+
tag char action in Insert mode ~
879+
-----------------------------------------------------------------------
880+
|o_v| v force operator to work characterwise
881+
|o_V| V force operator to work linewise
882+
|o_CTRL-V| CTRL-V force operator to work blockwise
883+
857884
==============================================================================
858885
3. Visual mode *visual-index*
859886

@@ -1066,10 +1093,28 @@ tag command action in Command-line editing mode ~
10661093
|c_<Insert>| <Insert> toggle insert/overstrike mode
10671094
|c_<LeftMouse>| <LeftMouse> cursor at mouse click
10681095

1096+
==============================================================================
1097+
5. Terminal-Job mode *terminal-job-index*
1098+
1099+
Most Normal mode commands except for window commands (|CTRL-W|) do not work in
1100+
a terminal window. Switch to Terminal-Normal mode to use them.
1101+
This assumes 'termwinkey' is not set.
1102+
1103+
tag char action in Insert mode ~
1104+
-----------------------------------------------------------------------
1105+
|t_CTRL-\_CTRL-N| CTRL-\ CTRL-N switch to Terminal-Normal mode
1106+
|CTRL-W_N| CTRL-W N switch to Terminal-Normal mode
1107+
|CTRL-W_:| CTRL-W : enter an Ex command
1108+
|CTRL-W_.| CTRL-W . type CTRL-W in the terminal
1109+
CTRL-W CTRL-\ send a CTRL-\ to the job in the terminal
1110+
|CTRL-W_quote| CTRL-W " {0-9a-z"%#*:=}
1111+
paste register in the terminal
1112+
|t_CTRL-W_CTRL-C| CTRL-W CTRL-C forcefully ends the job
1113+
10691114
You found it, Arthur! *holy-grail* *:smile*
10701115

10711116
==============================================================================
1072-
5. EX commands *ex-cmd-index* *:index*
1117+
6. EX commands *ex-cmd-index* *:index*
10731118

10741119
This is a brief but complete listing of all the ":" commands, without
10751120
mentioning any arguments. The optional part of the command name is inside [].

runtime/doc/options.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.1. Last change: 2019 Feb 16
1+
*options.txt* For Vim version 8.1. Last change: 2019 Feb 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2643,6 +2643,9 @@ A jump table for the options with a short description can be found at |Q_op|.
26432643
context:{n} Use a context of {n} lines between a change
26442644
and a fold that contains unchanged lines.
26452645
When omitted a context of six lines is used.
2646+
When using zero the context is actually one,
2647+
since folds require a line in between, also
2648+
for a deleted line.
26462649
See |fold-diff|.
26472650

26482651
iblank Ignore changes where lines are all blank. Adds
@@ -5658,8 +5661,9 @@ A jump table for the options with a short description can be found at |Q_op|.
56585661
The 'mousemodel' option is set by the |:behave| command.
56595662

56605663
*'mouseshape'* *'mouses'* *E547*
5661-
'mouseshape' 'mouses' string (default "i:beam,r:beam,s:updown,sd:cross,
5662-
m:no,ml:up-arrow,v:rightup-arrow")
5664+
'mouseshape' 'mouses' string (default "i-r:beam,s:updown,sd:udsizing,
5665+
vs:leftright,vd:lrsizing,m:no,
5666+
ml:up-arrow,v:rightup-arrow")
56635667
global
56645668
{not in Vi}
56655669
{only available when compiled with the |+mouseshape|

runtime/doc/pattern.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*pattern.txt* For Vim version 8.1. Last change: 2018 Dec 26
1+
*pattern.txt* For Vim version 8.1. Last change: 2019 Feb 21
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1211,7 +1211,7 @@ x A single character, with no special meaning, matches itself
12111211
\%u20AC Matches the character specified with up to four hexadecimal
12121212
characters.
12131213
\%U1234abcd Matches the character specified with up to eight hexadecimal
1214-
characters.
1214+
characters, up to 0x7fffffff
12151215

12161216
==============================================================================
12171217
7. Ignoring case in a pattern */ignorecase*

runtime/doc/tags

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8115,6 +8115,7 @@ omni-sql-completion ft_sql.txt /*omni-sql-completion*
81158115
online-help helphelp.txt /*online-help*
81168116
opening-window windows.txt /*opening-window*
81178117
operator motion.txt /*operator*
8118+
operator-pending-index index.txt /*operator-pending-index*
81188119
operator-variable eval.txt /*operator-variable*
81198120
option-backslash options.txt /*option-backslash*
81208121
option-list quickref.txt /*option-list*
@@ -9282,6 +9283,7 @@ terminal-diffscreendump terminal.txt /*terminal-diffscreendump*
92829283
terminal-dumptest terminal.txt /*terminal-dumptest*
92839284
terminal-functions usr_41.txt /*terminal-functions*
92849285
terminal-info term.txt /*terminal-info*
9286+
terminal-job-index index.txt /*terminal-job-index*
92859287
terminal-key-codes term.txt /*terminal-key-codes*
92869288
terminal-ms-windows terminal.txt /*terminal-ms-windows*
92879289
terminal-options term.txt /*terminal-options*

runtime/doc/terminal.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*terminal.txt* For Vim version 8.1. Last change: 2019 Feb 16
1+
*terminal.txt* For Vim version 8.1. Last change: 2019 Feb 22
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -80,6 +80,8 @@ Special in the terminal window: *CTRL-W_.* *CTRL-W_N*
8080
Also works with the = register to insert the result of
8181
evaluating an expression.
8282
CTRL-W CTRL-C ends the job, see below |t_CTRL-W_CTRL-C|
83+
CTRL-W gt go to next tabpage, same as `gt`
84+
CTRL-W gT go to previous tabpage, same as `gT`
8385

8486
See option 'termwinkey' for specifying another key instead of CTRL-W that
8587
will work like CTRL-W. However, typing 'termwinkey' twice sends 'termwinkey'

runtime/doc/todo.txt

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 8.1. Last change: 2019 Feb 17
1+
*todo.txt* For Vim version 8.1. Last change: 2019 Feb 22
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -38,6 +38,8 @@ browser use: https://github.com/vim/vim/issues/1234
3838
*known-bugs*
3939
-------------------- Known bugs and current work -----------------------
4040

41+
Check https://github.com/macvim-dev/macvim/issues/861.
42+
>
4143
Patch to add farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
4244
Added test, updates, June 23.
4345
Updated for 7.4: http://litcave.rudi.ir/farsi_vim.diff
@@ -131,7 +133,7 @@ Include part of #3242?
131133

132134
Improvement for :terminal winpty/conpty option. Ozaki Kiichi, #3905
133135

134-
Patch to change WIN32 macro names. (Hirohito Higashi, #3932)
136+
Patch to avoid compiler warnings. (Yasuhiro Matsumoto, #3979)
135137

136138
When a terminal exit_cb closes the window, a following typed key is lost, if
137139
it's in a mapping. (2018 Oct 6, #2302, #3522)
@@ -145,11 +147,16 @@ Should do current file first and not split it up when more results are found.
145147
Internal diff doesn't handle binary file like external diff does. (Mike
146148
Williams, 2018 Oct 30)
147149

150+
Patch to fix that dosinstall still has buffer overflow problems. (Yasuhiro
151+
Matsumoto, #4002)
152+
148153
Problem with :tlmenu: Detach item added with all modes? Issue #3563.
149154

150155
Patch to reduce amount of memory used by functions that keep reference.
151156
(ichizok, #3961)
152157

158+
Patch to use wide font functions. (Ken Takata, 2019 Feb 18, #4000)
159+
153160
When using a timer callback vgetc_busy is reset, allowing for using input().
154161
But in a channel callback this does not happen. We need to do something
155162
similar to check_due_timer(). Also see #3809.
@@ -160,6 +167,9 @@ C syntax: {} inside () causes following {} to be highlighted as error.
160167
Support setting the character displayed below the last line? Neovim uses
161168
"eob:X" in 'fillchars'.
162169

170+
Check: __attribute__((format(printf, on semsg() and siemsg(). Where was this
171+
added?
172+
163173
Make balloon_show() work outside of 'balloonexpr'? Users expect it to work:
164174
#2948. (related to #1512?)
165175
On Win32 it stops showing, because showState is already ShS_SHOWING.
@@ -171,21 +181,43 @@ balloonexpr() on MS-Windows GUI doesn't handle accented chars? (nivaemail,
171181
2018 Sep 14)
172182
Another request: #3811.
173183

184+
Height of quickfix window is not retained with vertical splits. (Lifepillar,
185+
2018 Aug 24, #2998)
186+
Patch on the issue by Hongbo Liu, 2019 Feb 19 #4013
187+
174188
More warnings from static analysis:
175189
https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
176190

191+
Still a E315 error when using terminal. (Masato Nishihata, #3959)
192+
177193
When using 'k' in 'guioptions' gvim may open with a tiny window. (#3808)
178194
Suggested patch on the issue.
179195

180196
nvo-mode mapping works on Windows, not on Linux. (#3678)
181197

198+
Patch to fix modify_fname() does not work well with some 'encoding's.
199+
(Ken Takata, #4007)
200+
201+
Patch to make vim_getenv() work with wide API. (Ken Takata, #4008)
202+
203+
Patch to add equal field to complete items. (#3887)
204+
205+
When using exclusive selection and vi" that fails, cursor moves to the left.
206+
Cursor should not move. (#4024)
207+
208+
Patch to fix that executable() may fail on very long filename in MS-Windows.
209+
(Ken Takata, 2016 Feb 1, update 2018 Oct 7, update 2019 Feb 19)
210+
Now in pull request #4015.
211+
182212
Patch to be able to separately map CTRL-H and BS on Windows.
183213
(Linwei, 2017 Jul 11, #1833)
184214

185215
Patch to fix encoding of messages on MS-Windows. (Yasuhiro Matsumoto, 2019 Feb
186216
13, #3914)
187217

188218
Patch to fix encoding conversion in messages. (#3969)
219+
Check that this is fixed: (ichizok)
220+
vim --clean -X -V1 -es -c 'echo "hello"' -c quit
189221

190222
Incsearch test fails when locale is "C". (Dominique Pelle, #3986)
191223
Also run all tests with C locale?
@@ -210,11 +242,14 @@ https://github.com/chrisbra/vim-mq-patches/blob/master/tagfunc
210242
Updated by Andy Massimino, 2018 Feb 7:
211243
https://github.com/andymass/vim/commit/4e3aa0a5dab96d2799567622f3f537e357aa479e
212244
Or should we make it asynchronous?
245+
Patch by Andy Massimino: #4010 - needs a bit more work
213246

214247
When 'confirm' is set a "silent q" doesn't show the prompt. It should in this
215248
case. (Nate Peterson, 2019 Jan 31, #3892)
216249
For "silent! q" it should not prompt and just fail.
217250

251+
Patch to add readdir(). (Yasuhiro Matsumoto, #2439)
252+
218253
Using CTRL-L to add a character to the search string doesn't work for the last
219254
character in the file. (Smylers, 2018 Nov 17, #3620)
220255
Suggested patch by Hirohito Higashi, 2018 Nov 18.
@@ -277,6 +312,8 @@ Patch to add environ(), gets a dict with all environment vars, and getenv(),
277312
useful for environment vars that are not made of keyword chars.
278313
(Yasuhiro Matsumoto, #2875)
279314

315+
Add buffer argument to undotree(). (#4001)
316+
280317
Patch to add optional arguments with default values.
281318
(Andy Massimino, #3952) under development
282319

@@ -405,9 +442,6 @@ Lemonboy can reproduce (2017 Jun 5)
405442
Also reproduced by Benjamin Doherty, 2018 Oct 4.
406443
Simpler way: Ken Takata, Oct 6.
407444

408-
Height of quickfix window is not retained with vertical splits. (Lifepillar,
409-
2018 Aug 24, #2998)
410-
411445
Window size is wrong when using quickfix window. (Lifepillar, 2018 Aug 24,
412446
#2999)
413447

@@ -423,9 +457,6 @@ is cleared, to avoid going back to the list of errors buffer (would have two
423457
windows with it). Can we just remove the jump list entries for the quickfix
424458
buffer?
425459

426-
Patch to fix that executable() may fail on very long filename in MS-Windows.
427-
(Ken Takata, 2016 Feb 1, update 2018 Oct 7)
428-
429460
Patch to be able to use hex numbers with :digraph. (Lcd, 2015 Sep 6)
430461
Update Sep 7. Update by Christian Brabandt, 2015 Sep 8, 2016 Feb 1.
431462
Patch to be able to disable default digraphs (incomplete) (Eric Pruitt, 2018
@@ -1004,6 +1035,10 @@ sort() is not stable when using numeric/float sort (Nikolay Pavlov, 2016 Sep
10041035
Although user could use "xterm -e 'cmd arg'".
10051036

10061037
Regexp problems:
1038+
- NFA engine can be slow for some patterns. Dominique found out that most
1039+
time is spent in addstate_here() copying the threads. Instead of copying,
1040+
let each thread point to the next one (by offset, the list is reallocated).
1041+
(Dominique Pelle, 2019 Feb 18)
10071042
- When search pattern has the base character both with and without combining
10081043
character, search fails. E.g. "รรีบ" in "การรีบรักใคร". (agguser, #2312)
10091044
- [:space:] only matches ASCII spaces. Add [:white:] for all space-like

runtime/doc/visual.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*visual.txt* For Vim version 8.1. Last change: 2019 Jan 11
1+
*visual.txt* For Vim version 8.1. Last change: 2019 Feb 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -118,6 +118,8 @@ gn Search forward for the last used search pattern, like
118118
E.g., "dgn" deletes the text of the next match.
119119
If Visual mode is active, extends the selection
120120
until the end of the next match.
121+
Note: Unlinke `n` the search direction does not depend
122+
on the previous search command.
121123

122124
*gN* *v_gN*
123125
gN Like |gn| but searches backward, like with `N`.

0 commit comments

Comments
 (0)