Skip to content

Commit b24ffe0

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 649038e + 5d712e4 commit b24ffe0

463 files changed

Lines changed: 42957 additions & 39536 deletions

File tree

Some content is hidden

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

CONTRIBUTING.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,23 @@ Patches are welcome in whatever form.
44
Discussions about patches happen on the vim-dev maillist.
55
If you create a pull request on GitHub it will be
66
forwarded to the vim-dev maillist. You can also send your patch there
7-
directly. An attachment with a unified diff format is preferred.
7+
directly. In that case an attachment with a unified diff format is preferred.
88
Information about the maillist can be found [on the Vim website].
99

1010
[on the Vim website]: http://www.vim.org/maillist.php#vim-dev
1111

12-
Please consider adding a test. Test coverage isn't very good yet, this needs
13-
to improve. Look through recent patches for examples. The tests are located
14-
under "src/testdir".
12+
A pull request has the advantage that it will trigger the Continuous
13+
Integration tests, you will be warned of problems (you can ignore the coverage
14+
warning, it's noisy).
15+
16+
Please consider adding a test. All new functionality should be tested and bug
17+
fixes should be tested for regressions: the test should fail before the fix and
18+
pass after the fix. Look through recent patches for examples and find help
19+
with ":help testing". The tests are located under "src/testdir".
20+
21+
Contributions will be distributed with Vim under the Vim license. Providing a
22+
change to be included implies that you agree with this and your contribution
23+
does not cause us trouble with trademarks or patents. There is no CLA to sign.
1524

1625

1726
# Reporting issues

Filelist

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ SRC_ALL = \
1313
src/README.md \
1414
src/alloc.h \
1515
src/arabic.c \
16+
src/arglist.c \
1617
src/ascii.h \
1718
src/autocmd.c \
1819
src/beval.c \
@@ -23,6 +24,8 @@ SRC_ALL = \
2324
src/change.c \
2425
src/channel.c \
2526
src/charset.c \
27+
src/cmdexpand.c \
28+
src/cmdhist.c \
2629
src/crypt.c \
2730
src/crypt_zip.c \
2831
src/debugger.c \
@@ -32,6 +35,7 @@ SRC_ALL = \
3235
src/edit.c \
3336
src/eval.c \
3437
src/evalfunc.c \
38+
src/evalvars.c \
3539
src/ex_cmdidxs.h \
3640
src/ex_cmds.c \
3741
src/ex_cmds.h \
@@ -60,6 +64,7 @@ SRC_ALL = \
6064
src/keymap.h \
6165
src/macros.h \
6266
src/main.c \
67+
src/map.c \
6368
src/mark.c \
6469
src/mbyte.c \
6570
src/memfile.c \
@@ -86,8 +91,10 @@ SRC_ALL = \
8691
src/regexp.c \
8792
src/regexp_nfa.c \
8893
src/regexp.h \
94+
src/scriptfile.c \
8995
src/screen.c \
9096
src/search.c \
97+
src/session.c \
9198
src/sha256.c \
9299
src/sign.c \
93100
src/sound.c \
@@ -110,6 +117,7 @@ SRC_ALL = \
110117
src/version.c \
111118
src/version.h \
112119
src/vim.h \
120+
src/viminfo.c \
113121
src/winclip.c \
114122
src/window.c \
115123
src/tee/tee.c \
@@ -161,6 +169,7 @@ SRC_ALL = \
161169
src/proto.h \
162170
src/protodef.h \
163171
src/proto/arabic.pro \
172+
src/proto/arglist.pro \
164173
src/proto/autocmd.pro \
165174
src/proto/beval.pro \
166175
src/proto/blob.pro \
@@ -169,6 +178,8 @@ SRC_ALL = \
169178
src/proto/change.pro \
170179
src/proto/channel.pro \
171180
src/proto/charset.pro \
181+
src/proto/cmdexpand.pro \
182+
src/proto/cmdhist.pro \
172183
src/proto/crypt.pro \
173184
src/proto/crypt_zip.pro \
174185
src/proto/debugger.pro \
@@ -178,6 +189,7 @@ SRC_ALL = \
178189
src/proto/edit.pro \
179190
src/proto/eval.pro \
180191
src/proto/evalfunc.pro \
192+
src/proto/evalvars.pro \
181193
src/proto/ex_cmds.pro \
182194
src/proto/ex_cmds2.pro \
183195
src/proto/ex_docmd.pro \
@@ -197,6 +209,7 @@ SRC_ALL = \
197209
src/proto/json.pro \
198210
src/proto/list.pro \
199211
src/proto/main.pro \
212+
src/proto/map.pro \
200213
src/proto/mark.pro \
201214
src/proto/mbyte.pro \
202215
src/proto/memfile.pro \
@@ -215,8 +228,10 @@ SRC_ALL = \
215228
src/proto/profiler.pro \
216229
src/proto/quickfix.pro \
217230
src/proto/regexp.pro \
231+
src/proto/scriptfile.pro \
218232
src/proto/screen.pro \
219233
src/proto/search.pro \
234+
src/proto/session.pro \
220235
src/proto/sha256.pro \
221236
src/proto/sign.pro \
222237
src/proto/sound.pro \
@@ -234,6 +249,7 @@ SRC_ALL = \
234249
src/proto/usercmd.pro \
235250
src/proto/userfunc.pro \
236251
src/proto/version.pro \
252+
src/proto/viminfo.pro \
237253
src/proto/winclip.pro \
238254
src/proto/window.pro \
239255
src/libvterm/.bzrignore \

runtime/autoload/syntaxcomplete.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
" Language: All languages, uses existing syntax highlighting rules
33
" Maintainer: David Fishburn <dfishburn dot vim at gmail dot com>
44
" Version: 13.0
5-
" Last Change: 2013 May 14
5+
" Last Change: 2019 Aug 08
66
" Usage: For detailed help, ":help ft-syntax-omni"
77

88
" History
@@ -597,7 +597,7 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
597597
" Remove all non-word characters
598598
" let syn_list = substitute( syn_list, '\<match /\zs.\{-}\<\W\+\>.\{-}\ze\/ ', "", 'g' )
599599
" let syn_list = substitute( syn_list, '\%(\<match \/[^/]\{-}\)\@<=\W\+\ze.\{-}\/ ', ' ', 'g' )
600-
" Do this by using the outer substitue() call to gather all
600+
" Do this by using the outer substitute() call to gather all
601601
" text between the match /.../ tags.
602602
" The inner substitute() call operates on the text selected
603603
" and replaces all non-word characters.

runtime/compiler/cs.vim

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
" Vim compiler file
2-
" Compiler: Microsoft Visual Studio C#
3-
" Maintainer: Zhou YiChao ([email protected])
4-
" Previous Maintainer: Joseph H. Yao ([email protected])
5-
" Last Change: 2012 Apr 30
2+
" Compiler: Microsoft Visual Studio C#
3+
" Maintainer: Yichao Zhou ([email protected])
4+
" Previous Maintainer: Joseph H. Yao ([email protected])
5+
" Last Change: Jul 22, 2019
66

77
if exists("current_compiler")
88
finish
@@ -20,7 +20,7 @@ CompilerSet errorformat+=%f(%l\\,%v):\ %t%*[^:]:\ %m,
2020
\%trror%*[^:]:\ %m,
2121
\%tarning%*[^:]:\ %m
2222

23-
CompilerSet makeprg=csc\ %
23+
CompilerSet makeprg=csc\ %:S
2424

2525
let &cpo = s:keepcpo
2626
unlet s:keepcpo

runtime/compiler/erlang.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
" Vim compiler file
22
" Compiler: Erlang
33
" Maintainer: Dmitry Vasiliev <dima at hlabs dot org>
4-
" Last Change: 2012-02-13
4+
" Last Change: 2019 Jul 23
55

66
if exists("current_compiler")
77
finish
88
endif
99
let current_compiler = "erlang"
1010

11-
CompilerSet makeprg=erlc\ -Wall\ %
11+
CompilerSet makeprg=erlc\ -Wall\ %:S
1212

1313
CompilerSet errorformat=%f:%l:\ %m

runtime/compiler/fortran_cv.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CompilerSet errorformat=
2222
\%-Z%p%^%.%#,
2323
\%-G%.%#,
2424
" Compiler call
25-
CompilerSet makeprg=df\ /nologo\ /noobj\ /c\ %
25+
CompilerSet makeprg=df\ /nologo\ /noobj\ /c\ %:S
2626
" Visual fortran defaults to printing output on stderr
2727
" Adjust option shellpipe accordingly
2828

runtime/compiler/jikes.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim Compiler File
22
" Compiler: Jikes
33
" Maintainer: Dan Sharp <dwsharp at hotmail dot com>
4-
" Last Change: 20 Jan 2009
4+
" Last Change: 2019 Jul 23
55
" URL: http://dwsharp.users.sourceforge.net/vim/compiler
66

77
if exists("current_compiler")
@@ -14,5 +14,5 @@ if exists(":CompilerSet") != 2 " older Vim always used :setlocal
1414
endif
1515

1616
" Jikes defaults to printing output on stderr
17-
CompilerSet makeprg=jikes\ -Xstdout\ +E\ \"%\"
17+
CompilerSet makeprg=jikes\ -Xstdout\ +E\ \"%:S\"
1818
CompilerSet errorformat=%f:%l:%v:%*\\d:%*\\d:%*\\s%m

runtime/compiler/onsgmls.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim compiler file
22
" Compiler: onsgmls
33
" Maintainer: Robert Rowsome <[email protected]>
4-
" Last Change: 2004 Mar 27
4+
" Last Change: 2019 Jul 23
55

66
if exists("current_compiler")
77
finish
@@ -15,7 +15,7 @@ endif
1515
let s:cpo_save = &cpo
1616
set cpo-=C
1717

18-
CompilerSet makeprg=onsgmls\ -s\ %
18+
CompilerSet makeprg=onsgmls\ -s\ %:S
1919

2020
CompilerSet errorformat=onsgmls:%f:%l:%c:%t:%m,
2121
\onsgmls:%f:%l:%c:%m

runtime/compiler/perl.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim Compiler File
22
" Compiler: Perl syntax checks (perl -Wc)
33
" Maintainer: Christian J. Robinson <[email protected]>
4-
" Last Change: 2006 Aug 13
4+
" Last Change: 2019 Jul 22
55

66
if exists("current_compiler")
77
finish
@@ -27,7 +27,7 @@ else
2727
let s:taintopt = ''
2828
endif
2929

30-
exe 'CompilerSet makeprg=perl\ -' . s:warnopt . s:taintopt . 'c\ %'
30+
exe 'CompilerSet makeprg=perl\ -' . s:warnopt . s:taintopt . 'c\ %:S'
3131

3232
CompilerSet errorformat=
3333
\%-G%.%#had\ compilation\ errors.,

runtime/compiler/rustc.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif
1919
if exists("g:rustc_makeprg_no_percent") && g:rustc_makeprg_no_percent != 0
2020
CompilerSet makeprg=rustc
2121
else
22-
CompilerSet makeprg=rustc\ \%
22+
CompilerSet makeprg=rustc\ \%:S
2323
endif
2424

2525
" Old errorformat (before nightly 2016/08/10)

0 commit comments

Comments
 (0)