Skip to content

Commit 519b052

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 6acaecf + f7ca56f commit 519b052

File tree

340 files changed

+12785
-5204
lines changed

Some content is hidden

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

340 files changed

+12785
-5204
lines changed

.github/CODEOWNERS_vim

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,24 @@ runtime/colors/delek.vim @habamax @romainl @neutaaaaan
2929
runtime/colors/desert.vim @habamax @romainl @neutaaaaan
3030
runtime/colors/elflord.vim @habamax @romainl @neutaaaaan
3131
runtime/colors/evening.vim @habamax @romainl @neutaaaaan
32+
runtime/colors/habamax.vim @habamax @romainl @neutaaaaan
3233
runtime/colors/industry.vim @habamax @romainl @neutaaaaan
3334
runtime/colors/koehler.vim @habamax @romainl @neutaaaaan
35+
runtime/colors/lunaperche.vim @habamax @romainl @neutaaaaan
3436
runtime/colors/morning.vim @habamax @romainl @neutaaaaan
3537
runtime/colors/murphy.vim @habamax @romainl @neutaaaaan
3638
runtime/colors/pablo.vim @habamax @romainl @neutaaaaan
3739
runtime/colors/peachpuff.vim @habamax @romainl @neutaaaaan
40+
runtime/colors/quiet.vim @habamax @romainl @neutaaaaan
41+
runtime/colors/retrobox.vim @habamax @romainl @neutaaaaan
3842
runtime/colors/ron.vim @habamax @romainl @neutaaaaan
3943
runtime/colors/shine.vim @habamax @romainl @neutaaaaan
4044
runtime/colors/slate.vim @habamax @romainl @neutaaaaan
45+
runtime/colors/sorbet.vim @habamax @romainl @neutaaaaan
4146
runtime/colors/tools @habamax @romainl @neutaaaaan
4247
runtime/colors/torte.vim @habamax @romainl @neutaaaaan
48+
runtime/colors/wildcharm.vim @habamax @romainl @neutaaaaan
49+
runtime/colors/zaibatsu.vim @habamax @romainl @neutaaaaan
4350
runtime/colors/zellner.vim @habamax @romainl @neutaaaaan
4451
runtime/compiler/checkstyle.vim @dkearns
4552
runtime/compiler/cm3.vim @dkearns
@@ -215,6 +222,7 @@ runtime/ftplugin/wget2.vim @dkearns
215222
runtime/ftplugin/xml.vim @chrisbra
216223
runtime/ftplugin/xs.vim @petdance
217224
runtime/ftplugin/zsh.vim @chrisbra
225+
runtime/import/dist/vimhighlight.vim @lacygoill
218226
runtime/indent/basic.vim @dkearns
219227
runtime/indent/bst.vim @tpope
220228
runtime/indent/cdl.vim @dkearns
@@ -253,6 +261,7 @@ runtime/indent/julia.vim @carlobaldassi
253261
runtime/indent/ld.vim @dkearns
254262
runtime/indent/less.vim @genoma
255263
runtime/indent/liquid.vim @tpope
264+
runtime/indent/lua.vim @marcuscf
256265
runtime/indent/make.vim @dkearns
257266
runtime/indent/meson.vim @Liambeguin
258267
runtime/indent/mma.vim @dkearns
@@ -367,6 +376,7 @@ runtime/syntax/haml.vim @tpope
367376
runtime/syntax/hare.vim @rsaihe
368377
runtime/syntax/haskell.vim @coot
369378
runtime/syntax/hgcommit.vim @k-takata
379+
runtime/syntax/hitest.vim @lacygoill
370380
runtime/syntax/hollywood.vim @sodero
371381
runtime/syntax/html.vim @dkearns
372382
runtime/syntax/i3config.vim @hiqua
@@ -383,6 +393,7 @@ runtime/syntax/less.vim @genoma
383393
runtime/syntax/lex.vim @cecamp
384394
runtime/syntax/liquid.vim @tpope
385395
runtime/syntax/lisp.vim @cecamp
396+
runtime/syntax/lua.vim @marcuscf
386397
runtime/syntax/lyrics.vim @ObserverOfTime
387398
runtime/syntax/lynx.vim @dkearns
388399
runtime/syntax/m3build.vim @dkearns

Filelist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ SRC_ALL = \
1818
.appveyor.yml \
1919
.codecov.yml \
2020
ci/appveyor.bat \
21-
ci/build-snd-dummy.sh \
2221
ci/config.mk*.sed \
2322
ci/if_ver*.vim \
24-
ci/load-snd-dummy.sh \
2523
ci/setup-xvfb.sh \
2624
src/Make_all.mak \
2725
src/README.md \
@@ -710,6 +708,7 @@ RT_ALL = \
710708
runtime/ftoff.vim \
711709
runtime/gvimrc_example.vim \
712710
runtime/import/dist/vimhelp.vim \
711+
runtime/import/dist/vimhighlight.vim \
713712
runtime/macros/README.txt \
714713
runtime/macros/editexisting.vim \
715714
runtime/macros/hanoi/click.me \

ci/load-snd-dummy.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)