Skip to content

Commit 432411c

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 3bd575d + 83497f8 commit 432411c

76 files changed

Lines changed: 3203 additions & 1603 deletions

Some content is hidden

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

.github/CODEOWNERS_vim

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ runtime/compiler/jjs.vim @dkearns
5959
runtime/compiler/jshint.vim @dkearns
6060
runtime/compiler/jsonlint.vim @dkearns
6161
runtime/compiler/lazbuild.vim @dkearns
62+
runtime/compiler/perl.vim @petdance @heptite
63+
runtime/compiler/perlcritic.vim @petdance @dkearns
6264
runtime/compiler/php.vim @dkearns
65+
runtime/compiler/podchecker.vim @petdance @dkearns
6366
runtime/compiler/powershell.vim @heaths
6467
runtime/compiler/rake.vim @tpope @dkearns
6568
runtime/compiler/rhino.vim @dkearns
@@ -129,7 +132,9 @@ runtime/ftplugin/nsis.vim @k-takata
129132
runtime/ftplugin/octave.vim @dkearns
130133
runtime/ftplugin/pascal.vim @dkearns
131134
runtime/ftplugin/pbtxt.vim @lakshayg
135+
runtime/ftplugin/perl.vim @petdance @dkearns
132136
runtime/ftplugin/pdf.vim @tpope
137+
runtime/ftplugin/pod.vim @petdance @dkearns
133138
runtime/ftplugin/postscr.vim @mrdubya
134139
runtime/ftplugin/ps1.vim @heaths
135140
runtime/ftplugin/ps1xml.vim @heaths
@@ -141,15 +146,18 @@ runtime/ftplugin/scss.vim @tpope
141146
runtime/ftplugin/solution.vim @dkearns
142147
runtime/ftplugin/spec.vim @ignatenkobrain
143148
runtime/ftplugin/systemverilog.vim @Kocha
149+
runtime/ftplugin/tap.vim @petdance
144150
runtime/ftplugin/tcsh.vim @dkearns
145151
runtime/ftplugin/tidy.vim @dkearns
146152
runtime/ftplugin/tmux.vim @ericpruitt
147153
runtime/ftplugin/toml.vim @averms
154+
runtime/ftplugin/tt2html.vim @petdance
148155
runtime/ftplugin/typescript.vim @dkearns
149156
runtime/ftplugin/typescriptreact.vim @dkearns
150157
runtime/ftplugin/wget.vim @dkearns
151158
runtime/ftplugin/wget2.vim @dkearns
152159
runtime/ftplugin/xml.vim @chrisbra
160+
runtime/ftplugin/xs.vim @petdance
153161
runtime/ftplugin/zsh.vim @chrisbra
154162
runtime/indent/basic.vim @dkearns
155163
runtime/indent/bst.vim @tpope
@@ -178,6 +186,7 @@ runtime/indent/mma.vim @dkearns
178186
runtime/indent/nginx.vim @chr4
179187
runtime/indent/nsis.vim @k-takata
180188
runtime/indent/occam.vim @dkearns
189+
runtime/indent/perl.vim @petdance
181190
runtime/indent/postscr.vim @mrdubya
182191
runtime/indent/prolog.vim @dkearns
183192
runtime/indent/ps1.vim @heaths
@@ -254,6 +263,7 @@ runtime/syntax/mailcap.vim @dkearns
254263
runtime/syntax/make.vim @rohieb
255264
runtime/syntax/maple.vim @cecamp
256265
runtime/syntax/markdown.vim @tpope
266+
runtime/syntax/mason.vim @petdance
257267
runtime/syntax/meson.vim @Liambeguin
258268
runtime/syntax/modula3.vim @dkearns
259269
runtime/syntax/netrw.vim @cecamp
@@ -263,7 +273,9 @@ runtime/syntax/nsis.vim @k-takata
263273
runtime/syntax/pascal.vim @dkearns
264274
runtime/syntax/pbtxt.vim @lakshayg
265275
runtime/syntax/pdf.vim @tpope
276+
runtime/syntax/perl.vim @petdance
266277
runtime/syntax/php.vim @TysonAndre
278+
runtime/syntax/pod.vim @petdance
267279
runtime/syntax/postscr.vim @mrdubya
268280
runtime/syntax/privoxy.vim @dkearns
269281
runtime/syntax/prolog.vim @XVilka
@@ -287,18 +299,23 @@ runtime/syntax/sshdconfig.vim @Jakuje
287299
runtime/syntax/sudoers.vim @e-kwsm
288300
runtime/syntax/systemverilog.vim @Kocha
289301
runtime/syntax/tags.vim @cecamp
302+
runtime/syntax/tap.vim @petdance
290303
runtime/syntax/tcsh.vim @dkearns
291304
runtime/syntax/teraterm.vim @k-takata
292305
runtime/syntax/tex.vim @cecamp
293306
runtime/syntax/tidy.vim @dkearns
294307
runtime/syntax/tmux.vim @ericpruitt
295308
runtime/syntax/toml.vim @averms
309+
runtime/syntax/tt2.vim @petdance
310+
runtime/syntax/tt2html.vim @petdance
311+
runtime/syntax/tt2js.vim @petdance
296312
runtime/syntax/vim.vim @cecamp
297313
runtime/syntax/wget.vim @dkearns
298314
runtime/syntax/wget2.vim @dkearns
299315
runtime/syntax/xbl.vim @dkearns
300316
runtime/syntax/xmath.vim @cecamp
301317
runtime/syntax/xml.vim @chrisbra
318+
runtime/syntax/xs.vim @petdance
302319
runtime/syntax/xslt.vim @Boobies
303320
runtime/syntax/xxd.vim @cecamp
304321
runtime/syntax/yacc.vim @cecamp

Filelist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,6 @@ SRC_DOS = \
574574
src/testdir/Make_ming.mak \
575575
src/testdir/dos.vim \
576576
src/uninstall.c \
577-
src/vim.def \
578577
src/vim.rc \
579578
src/vim.manifest \
580579
src/vimrun.c \

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ indenttest:
5656
cd runtime/indent && \
5757
$(MAKE) clean && \
5858
$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
59-
59+
6060

6161
#########################################################################
6262
# 2. Creating the various distribution files.
@@ -93,8 +93,7 @@ MINOR = 2
9393
# READMEdir/Contents, MAJOR/MINOR above, VIMMAJOR and VIMMINOR in
9494
# src/Makefile, README.txt, README.md, src/README.md, READMEdir/README*.txt,
9595
# runtime/doc/*.txt and make nsis/gvim_version.nsh.
96-
# For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.def,
97-
# src/vim.manifest.
96+
# For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.manifest.
9897
# - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, Lua, Cscope and
9998
# "huge" features. Add MZscheme if you can make it work.
10099
# Use "make reconfig" after selecting the configure arguments.

0 commit comments

Comments
 (0)