Skip to content

Commit 8eea335

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 97af264 + d17a57a commit 8eea335

124 files changed

Lines changed: 14625 additions & 14029 deletions

Some content is hidden

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

Filelist

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ SRC_ALL = \
2121
src/blob.c \
2222
src/blowfish.c \
2323
src/buffer.c \
24+
src/bufwrite.c \
2425
src/change.c \
2526
src/channel.c \
2627
src/charset.c \
@@ -92,14 +93,15 @@ SRC_ALL = \
9293
src/option.h \
9394
src/optiondefs.h \
9495
src/optionstr.c \
95-
src/popupmnu.c \
96+
src/popupmenu.c \
9697
src/popupwin.c \
9798
src/profiler.c \
9899
src/quickfix.c \
99100
src/regexp.c \
100101
src/regexp_bt.c \
101102
src/regexp_nfa.c \
102103
src/regexp.h \
104+
src/register.c \
103105
src/scriptfile.c \
104106
src/screen.c \
105107
src/search.c \
@@ -110,6 +112,7 @@ SRC_ALL = \
110112
src/spell.c \
111113
src/spell.h \
112114
src/spellfile.c \
115+
src/spellsuggest.c \
113116
src/structs.h \
114117
src/syntax.c \
115118
src/tag.c \
@@ -184,6 +187,7 @@ SRC_ALL = \
184187
src/proto/blob.pro \
185188
src/proto/blowfish.pro \
186189
src/proto/buffer.pro \
190+
src/proto/bufwrite.pro \
187191
src/proto/change.pro \
188192
src/proto/channel.pro \
189193
src/proto/charset.pro \
@@ -239,11 +243,12 @@ SRC_ALL = \
239243
src/proto/ops.pro \
240244
src/proto/option.pro \
241245
src/proto/optionstr.pro \
242-
src/proto/popupmnu.pro \
246+
src/proto/popupmenu.pro \
243247
src/proto/popupwin.pro \
244248
src/proto/profiler.pro \
245249
src/proto/quickfix.pro \
246250
src/proto/regexp.pro \
251+
src/proto/register.pro \
247252
src/proto/scriptfile.pro \
248253
src/proto/screen.pro \
249254
src/proto/search.pro \
@@ -253,6 +258,7 @@ SRC_ALL = \
253258
src/proto/sound.pro \
254259
src/proto/spell.pro \
255260
src/proto/spellfile.pro \
261+
src/proto/spellsuggest.pro \
256262
src/proto/syntax.pro \
257263
src/proto/tag.pro \
258264
src/proto/term.pro \
@@ -288,7 +294,7 @@ SRC_ALL = \
288294
src/libvterm/src/encoding/uk.inc \
289295
src/libvterm/src/encoding/uk.tbl \
290296
src/libvterm/src/keyboard.c \
291-
src/libvterm/src/mouse.c \
297+
src/libvterm/src/termmouse.c \
292298
src/libvterm/src/parser.c \
293299
src/libvterm/src/pen.c \
294300
src/libvterm/src/rect.h \
@@ -513,7 +519,7 @@ SRC_DOS = \
513519
src/testdir/Make_dos.mak \
514520
src/testdir/Make_ming.mak \
515521
src/testdir/dos.vim \
516-
src/uninstal.c \
522+
src/uninstall.c \
517523
src/vim.def \
518524
src/vim.rc \
519525
src/vimio.h \
@@ -528,7 +534,7 @@ SRC_DOS = \
528534
nsis/gvim_version.nsh \
529535
nsis/README.txt \
530536
nsis/lang/*.nsi \
531-
uninstal.txt \
537+
uninstall.txt \
532538
src/VisVim/Commands.cpp \
533539
src/VisVim/Commands.h \
534540
src/VisVim/DSAddIn.cpp \
@@ -848,7 +854,7 @@ BIN_AMI = \
848854
# files for DOS binary (also in extra archive)
849855
BIN_DOS = \
850856
README_bindos.txt \
851-
uninstal.txt \
857+
uninstall.txt \
852858

853859
# files for Win32 OLE binary (also in extra archive)
854860
BIN_OLE = \

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ MINOR = 1
165165
# xxd/xxd.exe to xxdw32.exe
166166
# vim.pdb to vimw32.pdb
167167
# install.exe to installw32.exe
168-
# uninstal.exe to uninstalw32.exe
168+
# uninstall.exe to uninstallw32.exe
169169
# Win32 GUI version build:
170170
# - > cd src
171171
# > nmake -f Make_mvc.mak GUI=yes
@@ -175,7 +175,7 @@ MINOR = 1
175175
# - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
176176
# - Move gvim.pdb to here.
177177
# - Copy "GvimExt/gvimext.dll" to here.
178-
# - Delete vimrun.exe, install.exe and uninstal.exe.
178+
# - Delete vimrun.exe, install.exe and uninstall.exe.
179179
# Win32 GUI version with OLE, PERL, Ruby, TCL, PYTHON and dynamic IME:
180180
# - Install the interfaces you want, see src/INSTALLpc.txt
181181
# Adjust bigvim.bat to match the version of each interface you want.
@@ -188,7 +188,7 @@ MINOR = 1
188188
# - check the output.
189189
# - Rename "gvim.exe" to "gvim_ole.exe".
190190
# - Rename gvim.pdb to "gvim_ole.pdb".
191-
# - Delete install.exe and uninstal.exe.
191+
# - Delete install.exe and uninstall.exe.
192192
# Create the archives:
193193
# - Copy all the "*.exe" files to where this Makefile is.
194194
# - Copy all the "*.pdb" files to where this Makefile is.
@@ -197,7 +197,7 @@ MINOR = 1
197197
# NSIS self installing exe:
198198
# - To get NSIS see http://nsis.sourceforge.net
199199
# - Make sure gvim_ole.exe, vimw32.exe, installw32.exe,
200-
# uninstalw32.exe, teew32.exe and xxdw32.exe have been build as mentioned
200+
# uninstallw32.exe, teew32.exe and xxdw32.exe have been build as mentioned
201201
# above.
202202
# - copy these files (get them from a binary archive or build them):
203203
# gvimext.dll in src/GvimExt
@@ -518,7 +518,7 @@ dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
518518
cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
519519
cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
520520
cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
521-
cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
521+
cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
522522
mkdir dist/vim/$(VIMRTDIR)/GvimExt32
523523
cp gvimext.dll dist/vim/$(VIMRTDIR)/GvimExt32/gvimext.dll
524524
mkdir dist/vim/$(VIMRTDIR)/GvimExt64
@@ -539,7 +539,7 @@ dosbin_w32: dist no_title.vim dist/$(COMMENT_W32)
539539
cp teew32.exe dist/vim/$(VIMRTDIR)/tee.exe
540540
cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
541541
cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
542-
cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
542+
cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
543543
cd dist && zip -9 -rD -z vim$(VERSION)w32.zip vim <$(COMMENT_W32)
544544
cp vimw32.pdb dist/vim$(VERSION)w32.pdb
545545

@@ -557,7 +557,7 @@ dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE)
557557
cp xxdw32.exe dist/vim/$(VIMRTDIR)/xxd.exe
558558
cp vimrun.exe dist/vim/$(VIMRTDIR)/vimrun.exe
559559
cp installw32.exe dist/vim/$(VIMRTDIR)/install.exe
560-
cp uninstalw32.exe dist/vim/$(VIMRTDIR)/uninstal.exe
560+
cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
561561
cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
562562
cp README_ole.txt dist/vim/$(VIMRTDIR)
563563
cp src/VisVim/VisVim.dll dist/vim/$(VIMRTDIR)/VisVim.dll

nsis/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To build the installable .exe:
1414
gvim.exe (the OLE version),
1515
vimrun.exe,
1616
install.exe,
17-
uninstal.exe,
17+
uninstall.exe,
1818
tee/tee.exe,
1919
xxd/xxd.exe,
2020

nsis/gvim.nsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,13 @@ Section "$(str_section_exe)" id_section_exe
341341
File ${VIMSRC}\vim${BIT}.dll
342342
!endif
343343
File /oname=install.exe ${VIMSRC}\installw32.exe
344-
File /oname=uninstal.exe ${VIMSRC}\uninstalw32.exe
344+
File /oname=uninstall.exe ${VIMSRC}\uninstallw32.exe
345345
File ${VIMSRC}\vimrun.exe
346346
File /oname=tee.exe ${VIMSRC}\teew32.exe
347347
File /oname=xxd.exe ${VIMSRC}\xxdw32.exe
348348
File ..\vimtutor.bat
349349
File ..\README.txt
350-
File ..\uninstal.txt
350+
File ..\uninstall.txt
351351
File ${VIMRT}\*.vim
352352
File ${VIMRT}\rgb.txt
353353

@@ -955,7 +955,7 @@ Section "un.$(str_unsection_register)" id_unsection_register
955955

956956
# delete the context menu entry and batch files
957957
DetailPrint "$(str_msg_unregistering)"
958-
nsExec::Exec "$0\uninstal.exe -nsis"
958+
nsExec::Exec "$0\uninstall.exe -nsis"
959959
Pop $3
960960

961961
# We may have been put to the background when uninstall did something.

runtime/autoload/htmlcomplete.vim

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim completion script
22
" Language: HTML and XHTML
33
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
4-
" Last Change: 2014 Jun 20
4+
" Last Change: 2019 Sep 27
55

66
" Distinguish between HTML versions.
77
" To use with other HTML versions add another "elseif" condition to match
@@ -245,7 +245,8 @@ function! htmlcomplete#CompleteTags(findstart, base)
245245
" If context contains white space it is attribute.
246246
" It can be also value of attribute.
247247
" We have to get first word to offer proper completions
248-
if context == ''
248+
if context =~ '^\s*$'
249+
" empty or whitespace line
249250
let tag = ''
250251
else
251252
let tag = split(context)[0]

runtime/doc/change.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 8.1. Last change: 2019 Aug 21
1+
*change.txt* For Vim version 8.1. Last change: 2019 Sep 27
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1172,7 +1172,7 @@ Rationale: In Vi the "y" command followed by a backwards motion would
11721172
With a linewise yank command the cursor is put in the first line, but the
11731173
column is unmodified, thus it may not be on the first yanked character.
11741174

1175-
There are ten types of registers: *registers* *E354*
1175+
There are ten types of registers: *registers* *{register}* *E354*
11761176
1. The unnamed register ""
11771177
2. 10 numbered registers "0 to "9
11781178
3. The small delete register "-
@@ -1312,7 +1312,7 @@ When writing to this register, nothing happens. This can be used to delete
13121312
text without affecting the normal registers. When reading from this register,
13131313
nothing is returned.
13141314

1315-
10. Last search pattern register "/ *quote_/* *quote/*
1315+
10. Last search pattern register "/ *quote_/* *quote/*
13161316
Contains the most recent search-pattern. This is used for "n" and 'hlsearch'.
13171317
It is writable with `:let`, you can change it to have 'hlsearch' highlight
13181318
other matches without actually searching. You can't yank or delete into this
@@ -1618,8 +1618,6 @@ By default, "b:#" is included. This means that a line that starts with
16181618
"#include" is not recognized as a comment line. But a line that starts with
16191619
"# define" is recognized. This is a compromise.
16201620

1621-
{not available when compiled without the |+comments| feature}
1622-
16231621
*fo-table*
16241622
You can use the 'formatoptions' option to influence how Vim formats text.
16251623
'formatoptions' is a string that can contain any of the letters below. The

runtime/doc/cmdline.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*cmdline.txt* For Vim version 8.1. Last change: 2019 Sep 04
1+
*cmdline.txt* For Vim version 8.1. Last change: 2019 Sep 27
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -129,7 +129,7 @@ CTRL-K {char1} {char2} *c_CTRL-K*
129129
enter digraph (see |digraphs|). When {char1} is a special
130130
key, the code for that key is inserted in <> form.
131131

132-
CTRL-R {0-9a-z"%#:-=.} *c_CTRL-R* *c_<C-R>*
132+
CTRL-R {register} *c_CTRL-R* *c_<C-R>*
133133
Insert the contents of a numbered or named register. Between
134134
typing CTRL-R and the second character '"' will be displayed
135135
to indicate that you are expected to enter the name of a
@@ -191,8 +191,8 @@ CTRL-R CTRL-L *c_CTRL-R_CTRL-L* *c_<C-R>_<C-L>*
191191

192192
*c_CTRL-R_CTRL-R* *c_<C-R>_<C-R>*
193193
*c_CTRL-R_CTRL-O* *c_<C-R>_<C-O>*
194-
CTRL-R CTRL-R {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}
195-
CTRL-R CTRL-O {0-9a-z"%#:-=. CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}
194+
CTRL-R CTRL-R {register CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}
195+
CTRL-R CTRL-O {register CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}
196196
Insert register or object under the cursor. Works like
197197
|c_CTRL-R| but inserts the text literally. For example, if
198198
register a contains "xy^Hz" (where ^H is a backspace),

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 8.1. Last change: 2019 Jun 10
1+
*editing.txt* For Vim version 8.1. Last change: 2019 Sep 27
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1554,7 +1554,7 @@ focus.
15541554
If you want to automatically reload a file when it has been changed outside of
15551555
Vim, set the 'autoread' option. This doesn't work at the moment you write the
15561556
file though, only when the file wasn't changed inside of Vim.
1557-
1557+
*ignore-timestamp*
15581558
If you do not want to be asked or automatically reload the file, you can use
15591559
this: >
15601560
set buftype=nofile

runtime/doc/eval.txt

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.1. Last change: 2019 Sep 19
1+
*eval.txt* For Vim version 8.1. Last change: 2019 Sep 27
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2819,6 +2819,7 @@ term_gettty({buf}, [{input}]) String get the tty name of a terminal
28192819
term_list() List get the list of terminal buffers
28202820
term_scrape({buf}, {row}) List get row of a terminal screen
28212821
term_sendkeys({buf}, {keys}) none send keystrokes to a terminal
2822+
term_setapi({buf}, {expr}) none set |terminal-api| function name prefix
28222823
term_setansicolors({buf}, {colors})
28232824
none set ANSI palette in GUI color mode
28242825
term_setkill({buf}, {how}) none set signal to stop job in terminal
@@ -3262,9 +3263,14 @@ bufnr([{expr} [, {create}]])
32623263
The result is the number of a buffer, as it is displayed by
32633264
the ":ls" command. For the use of {expr}, see |bufname()|
32643265
above.
3266+
32653267
If the buffer doesn't exist, -1 is returned. Or, if the
32663268
{create} argument is present and not zero, a new, unlisted,
3267-
buffer is created and its number is returned.
3269+
buffer is created and its number is returned. Example: >
3270+
let newbuf = bufnr('Scratch001', 1)
3271+
< Using an empty name uses the current buffer. To create a new
3272+
buffer with an empty name use |bufadd()|.
3273+
32683274
bufnr("$") is the last buffer: >
32693275
:let last_buffer = bufnr("$")
32703276
< The result is a Number, which is the highest buffer number
@@ -9628,9 +9634,14 @@ systemlist({expr} [, {input}]) *systemlist()*
96289634
Same as |system()|, but returns a |List| with lines (parts of
96299635
output separated by NL) with NULs transformed into NLs. Output
96309636
is the same as |readfile()| will output with {binary} argument
9631-
set to "b". Note that on MS-Windows you may get trailing CR
9632-
characters.
9637+
set to "b", except that there is no extra empty item when the
9638+
result ends in a NL.
9639+
Note that on MS-Windows you may get trailing CR characters.
96339640

9641+
To see the difference between "echo hello" and "echo -n hello"
9642+
use |system()| and |split()|: >
9643+
echo system('echo hello')->split('\n', 1)
9644+
<
96349645
Returns an empty string on error.
96359646

96369647
Can also be used as a |method|: >

runtime/doc/filetype.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,10 @@ If you do not like the default folding, use an autocommand to add your desired
595595
folding style instead. For example: >
596596
autocmd FileType man setlocal foldmethod=indent foldenable
597597
598+
If you would like :Man {number} {name} to behave like man {number} {name} by
599+
not running man {name} if no page is found, then use this: >
600+
let g:ft_man_no_sect_fallback = 1
601+
598602
You may also want to set 'keywordprg' to make the |K| command open a manual
599603
page in a Vim window: >
600604
set keywordprg=:Man

0 commit comments

Comments
 (0)