Skip to content

Commit 4d771f2

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 15931f2 + 3d30af8 commit 4d771f2

Some content is hidden

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

57 files changed

+678
-308
lines changed

.github/CODEOWNERS_vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ runtime/compiler/jest.vim @dkearns
3838
runtime/compiler/jjs.vim @dkearns
3939
runtime/compiler/jshint.vim @dkearns
4040
runtime/compiler/jsonlint.vim @dkearns
41+
runtime/compiler/lazbuild.vim @dkearns
4142
runtime/compiler/php.vim @dkearns
4243
runtime/compiler/rake.vim @tpope @dkearns
4344
runtime/compiler/rhino.vim @dkearns
@@ -47,6 +48,7 @@ runtime/compiler/ruby.vim @tpope @dkearns
4748
runtime/compiler/rubyunit.vim @dkearns
4849
runtime/compiler/sass.vim @tpope
4950
runtime/compiler/se.vim @dkearns
51+
runtime/compiler/shellcheck.vim @dkearns
5052
runtime/compiler/stylelint.vim @dkearns
5153
runtime/compiler/tcl.vim @dkearns
5254
runtime/compiler/tidy.vim @dkearns

Filelist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ SRC_ALL = \
1010
.travis.yml \
1111
.cirrus.yml \
1212
.github/workflows/ci-windows.yaml \
13+
.github/workflows/codeql-analysis.yml \
1314
.github/CODEOWNERS \
1415
appveyor.yml \
1516
ci/appveyor.bat \

README_VIM9.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ e.g. each stack item is a typeval_T. And one of the instructions is
8080
"execute Ex command", for commands that are not compiled.
8181

8282

83-
## 2. PHASING OUT INTERFACES
83+
## 2. DEPRIORITIZE INTERFACES
8484

8585
Attempts have been made to implement functionality with built-in script
8686
languages such as Python, Perl, Lua, Tcl and Ruby. This never gained much

runtime/autoload/python3complete.vim

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
"python3complete.vim - Omni Completion for python
2-
" Maintainer: Aaron Griffin <[email protected]>
2+
" Maintainer: <vacancy>
3+
" Previous Maintainer: Aaron Griffin <[email protected]>
34
" Version: 0.9
4-
" Last Updated: 18 Jun 2009 (small fix 2015 Sep 14 from Debian)
5+
" Last Updated: 2020 Oct 9
56
"
67
" Roland Puntaier: this file contains adaptations for python3 and is parallel to pythoncomplete.vim
78
"
@@ -83,7 +84,7 @@ function! python3complete#Complete(findstart, base)
8384
break
8485
endif
8586
endwhile
86-
execute "py3 vimpy3complete('" . cword . "', '" . a:base . "')"
87+
execute "py3 vimpy3complete('" . escape(cword, "'") . "', '" . escape(a:base, "'") . "')"
8788
return g:python3complete_completions
8889
endif
8990
endfunction

runtime/autoload/pythoncomplete.vim

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
"pythoncomplete.vim - Omni Completion for python
2-
" Maintainer: Aaron Griffin <[email protected]>
2+
" Maintainer: <vacancy>
3+
" Previous Maintainer: Aaron Griffin <[email protected]>
34
" Version: 0.9
4-
" Last Updated: 18 Jun 2009
5+
" Last Updated: 2020 Oct 9
56
"
67
" Changes
78
" TODO:
@@ -81,7 +82,7 @@ function! pythoncomplete#Complete(findstart, base)
8182
break
8283
endif
8384
endwhile
84-
execute "python vimcomplete('" . cword . "', '" . a:base . "')"
85+
execute "python vimcomplete('" . escape(cword, "'") . "', '" . escape(a:base, "'") . "')"
8586
return g:pythoncomplete_completions
8687
endif
8788
endfunction

runtime/colors/README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ You can use ":highlight" to find out the current colors. Exception: the
6767
ctermfg and ctermbg values are numbers, which are only valid for the current
6868
terminal. Use the color names instead. See ":help cterm-colors".
6969

70-
The default color settings can be found in the source file src/syntax.c.
70+
The default color settings can be found in the source file src/highlight.c.
7171
Search for "highlight_init".
7272

7373
If you think you have a color scheme that is good enough to be used by others,

runtime/defaults.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" The default vimrc file.
22
"
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last change: 2019 Oct 27
4+
" Last change: 2020 Sep 30
55
"
66
" This is loaded if no vimrc file was found.
77
" Except when Vim is run with "-u NONE" or "-C".

runtime/doc/eval.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.2. Last change: 2020 Sep 25
1+
*eval.txt* For Vim version 8.2. Last change: 2020 Oct 05
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -897,7 +897,7 @@ Example: >
897897
All expressions within one level are parsed from left to right.
898898

899899

900-
expr1 *expr1* *trinary* *falsy-operator* *E109*
900+
expr1 *expr1* *trinary* *falsy-operator* *??* *E109*
901901
-----
902902

903903
The trinary operator: expr2 ? expr1 : expr1
@@ -3515,7 +3515,7 @@ byteidxcomp({expr}, {nr}) *byteidxcomp()*
35153515
< The first and third echo result in 3 ('e' plus composing
35163516
character is 3 bytes), the second echo results in 1 ('e' is
35173517
one byte).
3518-
Only works different from byteidx() when 'encoding' is set to
3518+
Only works differently from byteidx() when 'encoding' is set to
35193519
a Unicode encoding.
35203520

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

runtime/doc/index.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*index.txt* For Vim version 8.2. Last change: 2020 May 31
1+
*index.txt* For Vim version 8.2. Last change: 2020 Oct 05
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -784,10 +784,10 @@ tag char note action in Normal mode ~
784784
lines down
785785
|gk| gk 1 like "k", but when 'wrap' on go N screen
786786
lines up
787-
|gn| gn 1,2 find the next match with the last used
788-
search pattern and Visually select it
789787
|gm| gm 1 go to character at middle of the screenline
790788
|gM| gM 1 go to character at middle of the text line
789+
|gn| gn 1,2 find the next match with the last used
790+
search pattern and Visually select it
791791
|go| go 1 cursor to byte N in the buffer
792792
|gp| ["x]gp 2 put the text [from register x] after the
793793
cursor N times, leave the cursor after it
@@ -1317,6 +1317,7 @@ tag command action ~
13171317
|:filetype| :filet[ype] switch file type detection on/off
13181318
|:filter| :filt[er] filter output of following command
13191319
|:find| :fin[d] find file in 'path' and edit it
1320+
|:final| :final declare an immutable variable in Vim9
13201321
|:finally| :fina[lly] part of a :try command
13211322
|:finish| :fini[sh] quit sourcing a Vim script
13221323
|:first| :fir[st] go to the first file in the argument list
@@ -1693,6 +1694,7 @@ tag command action ~
16931694
|:unsilent| :uns[ilent] run a command not silently
16941695
|:update| :up[date] write buffer if modified
16951696
|:vglobal| :v[global] execute commands for not matching lines
1697+
|:var| :var variable declaration in Vim9
16961698
|:version| :ve[rsion] print version number and other info
16971699
|:verbose| :verb[ose] execute command with 'verbose' set
16981700
|:vertical| :vert[ical] make following command split vertically

runtime/doc/map.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*map.txt* For Vim version 8.2. Last change: 2020 Sep 09
1+
*map.txt* For Vim version 8.2. Last change: 2020 Oct 07
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -252,6 +252,17 @@ For abbreviations |v:char| is set to the character that was typed to trigger
252252
the abbreviation. You can use this to decide how to expand the {lhs}. You
253253
should not either insert or change the v:char.
254254

255+
In case you want the mapping to not do anything, you can have the expression
256+
evaluate to an empty string. If something changed that requires Vim to
257+
go through the main loop (e.g. to update the display), return "\<Ignore>".
258+
This is similar to "nothing" but makes Vim return from the loop that waits for
259+
input. Example: >
260+
func s:OpenPopup()
261+
call popup_create(... arguments ...)
262+
return "\<Ignore>"
263+
endfunc
264+
nnoremap <expr> <F3> <Sid>OpenPopup()
265+
255266
Be very careful about side effects! The expression is evaluated while
256267
obtaining characters, you may very well make the command dysfunctional.
257268
For this reason the following is blocked:

0 commit comments

Comments
 (0)