Skip to content

Commit 7c9b86b

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents caf7642 + 69e4455 commit 7c9b86b

File tree

114 files changed

+12015
-1294
lines changed

Some content is hidden

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

114 files changed

+12015
-1294
lines changed

README_VIM9.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Instead of using script language support in Vim:
9898
tool and implements the Vim side of the interface. Also, it can be used when
9999
an external tool is undesired.
100100

101-
All together this creates a clear situation: Vim with the +eval feature
101+
Altogether this creates a clear situation: Vim with the +eval feature
102102
will be sufficient for most plugins, while some plugins require
103103
installing a tool that can be written in any language. No confusion
104104
about having Vim but the plugin not working because some specific

ci/load-snd-dummy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ set -e
33

44
if ! modprobe snd-dummy; then
55
# snd-dummy is contained in linux-modules-extra (if exists)
6-
apt install -y "linux-modules-extra-$(uname -r)"
6+
apt-get install -yq --no-install-suggests --no-install-recommends "linux-modules-extra-$(uname -r)"
77
modprobe snd-dummy
88
fi

runtime/autoload/dist/ft.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ endfunc
575575
let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
576576
func dist#ft#FTRules()
577577
let path = expand('<amatch>:p')
578-
if path =~ '^/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|lib/udev/\%(rules\.d/\)\=.*\.rules\)$'
578+
if path =~ '/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|\%(usr/\)\=lib/udev/\%(rules\.d/\)\=.*\.rules\)$'
579579
setf udevrules
580580
return
581581
endif

runtime/colors/tools/check_colors.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func! Test_check_colors()
185185

186186
" 9) Normal should be defined first, not use reverse, fg or bg
187187
call cursor(1,1)
188-
let pat = 'hi\%[light] \+\%(link\|clear\)\@!\w\+\>'
188+
let pat = 'hi\%[ghlight] \+\%(link\|clear\)\@!\w\+\>'
189189
call search(pat, 'cW') " Look for the first hi def, skipping `hi link` and `hi clear`
190190
if getline('.') !~# '\m\<Normal\>'
191191
let err['highlight']['Normal'] = 'Should be defined first'

runtime/compiler/checkstyle.vim

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim compiler file
22
" Compiler: Checkstyle
33
" Maintainer: Doug Kearns <dougkearns@gmail.com>
4-
" Last Change: 2013 Jun 26
4+
" Last Change: 2020 Aug 2
55

66
if exists("current_compiler")
77
finish
@@ -12,8 +12,18 @@ if exists(":CompilerSet") != 2 " older Vim always used :setlocal
1212
command -nargs=* CompilerSet setlocal <args>
1313
endif
1414

15-
CompilerSet makeprg=java\ com.puppycrawl.tools.checkstyle.Main\ -f\ plain
15+
let s:cpo_save = &cpo
16+
set cpo&vim
1617

17-
" sample error: WebTable.java:282: '+=' is not preceeded with whitespace.
18-
" WebTable.java:201:1: '{' should be on the previous line.
19-
CompilerSet errorformat=%f:%l:%v:\ %m,%f:%l:\ %m,%-G%.%#
18+
" CompilerSet makeprg=java\ com.puppycrawl.tools.checkstyle.Main\ -f\ plain\ -c\ /sun_checks.xml
19+
" CompilerSet makeprg=java\ -jar\ checkstyle-X.XX-all.jar\ -f\ plain\ -c\ /sun_checks.xml
20+
21+
CompilerSet makeprg=checkstyle\ -f\ plain
22+
CompilerSet errorformat=[%tRROR]\ %f:%l:%v:\ %m,
23+
\[%tARN]\ %f:%l:%v:\ %m,
24+
\[%tRROR]\ %f:%l:\ %m,
25+
\[%tARN]\ %f:%l:\ %m,
26+
\%-G%.%#
27+
28+
let &cpo = s:cpo_save
29+
unlet s:cpo_save

runtime/compiler/gawk.vim

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
" Vim compiler file
2+
" Compiler: GNU Awk
3+
" Maintainer: Doug Kearns <dougkearns@gmail.com>
4+
" Last Change: 2020 Feb 10
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "gawk"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
CompilerSet makeprg=gawk
19+
CompilerSet errorformat=%Z%.awk:\ %f:%l:\ %p^\ %m,
20+
\%Eg%\\=awk:\ %f:%l:\ fatal:\ %m,
21+
\%Egawk:\ %f:%l:\ error:\ %m,
22+
\%Wgawk:\ %f:%l:\ warning:\ %m,
23+
\%Egawk:\ %f:%l:\ %.%#,
24+
\gawk:\ %f:%l:\ %tatal:\ %m,
25+
\gawk:\ %f:%l:\ %trror:\ %m,
26+
\gawk:\ %f:%l:\ %tarning:\ %m,
27+
\gawk:\ %tatal:\ %m,
28+
\gawk:\ %trror:\ %m,
29+
\gawk:\ %tarning:\ %m,
30+
\%+C%.%#,
31+
\%-G%.%#
32+
33+
let &cpo = s:cpo_save
34+
unlet s:cpo_save

runtime/compiler/gjs.vim

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
" Vim compiler file
2+
" Compiler: GJS (Gnome JavaScript Bindings)
3+
" Maintainer: Doug Kearns <dougkearns@gmail.com>
4+
" Last Change: 2019 Jul 10
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "gjs"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
CompilerSet makeprg=gjs
19+
CompilerSet errorformat=%.%#JS\ %tRROR:\ %m\ @\ %f:%c,
20+
\%E%.%#JS\ ERROR:\ %m,
21+
\%Z@%f:%l:%c,
22+
\%-G%.%#
23+
24+
let &cpo = s:cpo_save
25+
unlet s:cpo_save

runtime/compiler/jest.vim

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
" Vim compiler file
2+
" Compiler: Jest
3+
" Maintainer: Doug Kearns <dougkearns@gmail.com>
4+
" Last Change: 2018 May 15
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "jest"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
" CompilerSet makeprg=npx\ jest\ --no-colors
19+
20+
CompilerSet makeprg=jest\ --no-colors
21+
CompilerSet errorformat=%E\ \ \ %m,
22+
\%Z\ %\\{4}%.%#Error:\ %f:\ %m\ (%l:%c):%\\=,
23+
\%Z\ %\\{6}at\ %\\S%#\ (%f:%l:%c),
24+
\%+C\ %\\{4}%\\w%.%#,
25+
\%+C\ %\\{4}%[-+]%.%#,
26+
\%-C%.%#,
27+
\%-G%.%#
28+
29+
let &cpo = s:cpo_save
30+
unlet s:cpo_save

runtime/compiler/jjs.vim

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
" Vim compiler file
2+
" Compiler: Nashorn Shell
3+
" Maintainer: Doug Kearns <dougkearns@gmail.com>
4+
" Last Change: 2018 Jan 9
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "jjs"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
CompilerSet makeprg=jjs
19+
CompilerSet errorformat=%f:%l:%c\ %m,
20+
\%f:%l\ %m,
21+
\%-G%.%#
22+
23+
let &cpo = s:cpo_save
24+
unlet s:cpo_save

runtime/compiler/jshint.vim

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
" Vim compiler file
2+
" Compiler: JSHint
3+
" Maintainer: Doug Kearns <dougkearns@gmail.com>
4+
" Last Change: 2019 Jul 10
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "jshint"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
" CompilerSet makeprg=npx\ jshint\ --verbose
19+
20+
CompilerSet makeprg=jshint\ --verbose
21+
CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m\ (%t%n),
22+
\%-G%.%#
23+
24+
let &cpo = s:cpo_save
25+
unlet s:cpo_save

0 commit comments

Comments
 (0)