Skip to content

Commit a3db3e7

Browse files
ychinychin
committed
Merge remote-tracking branch 'vim/master'
2 parents b0e4e53 + f1ed841 commit a3db3e7

905 files changed

Lines changed: 40619 additions & 12920 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.

‎.appveyor.yml‎

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

‎.github/MAINTAINERS‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ runtime/autoload/javascriptcomplete.vim @jsit
1818
runtime/autoload/modula2.vim @dkearns
1919
runtime/autoload/rubycomplete.vim @segfault @dkearns
2020
runtime/autoload/rust.vim @lilyball
21+
runtime/autoload/tohtml.vim @fritzophrenic
2122
runtime/autoload/typeset.vim @lifepillar
2223
runtime/autoload/xmlformat.vim @chrisbra
2324
runtime/autoload/dist/json.vim @habamax
@@ -133,6 +134,7 @@ runtime/doc/xxd-ru.1 @RestorerZ
133134
runtime/doc/xxd-ru.UTF-8.1 @RestorerZ
134135
runtime/ftplugin/abaqus.vim @costerwi
135136
runtime/ftplugin/abnf.vim @A4-Tacks
137+
runtime/ftplugin/algol68.vim @dkearns
136138
runtime/ftplugin/antlr4.vim @jiangyinzuo
137139
runtime/ftplugin/apache.vim @dubgeiser
138140
runtime/ftplugin/arduino.vim @k-takata
@@ -338,6 +340,7 @@ runtime/ftplugin/thrift.vim @jiangyinzuo
338340
runtime/ftplugin/tiasm.vim @Freed-Wu
339341
runtime/ftplugin/tidy.vim @dkearns
340342
runtime/ftplugin/tmux.vim @ericpruitt
343+
runtime/ftplugin/tolk.vim @redavy
341344
runtime/ftplugin/toml.vim @averms
342345
runtime/ftplugin/tt2html.vim @petdance
343346
runtime/ftplugin/twig.vim @ribru17
@@ -402,6 +405,7 @@ runtime/indent/json.vim @elzr
402405
runtime/indent/jsonc.vim @izhakjakov
403406
runtime/indent/julia.vim @carlobaldassi
404407
runtime/indent/just.vim @pbnj
408+
runtime/indent/karel.vim @KnoP-01
405409
runtime/indent/kdl.vim @imsnif @jiangyinzuo
406410
runtime/indent/kotlin.vim @udalov
407411
runtime/indent/krl.vim @KnoP-01
@@ -468,10 +472,12 @@ runtime/pack/dist/opt/helptoc/ @kennypete
468472
runtime/pack/dist/opt/matchit/ @chrisbra
469473
runtime/pack/dist/opt/nohlsearch/ @habamax
470474
runtime/plugin/manpager.vim @Konfekt
471-
runtime/syntax/shared/hgcommitDiff.vim @vegerot
475+
runtime/plugin/tohtml.vim @fritzophrenic
476+
runtime/syntax/2html.vim @fritzophrenic
472477
runtime/syntax/abaqus.vim @costerwi
473478
runtime/syntax/abnf.vim @A4-Tacks
474479
runtime/syntax/aidl.vim @dpelle
480+
runtime/syntax/algol68.vim @dkearns
475481
runtime/syntax/amiga.vim @sodero
476482
runtime/syntax/ant.vim @dkearns
477483
runtime/syntax/antlr4.vim @jiangyinzuo
@@ -578,17 +584,17 @@ runtime/syntax/java.vim @zzzyxwvut
578584
runtime/syntax/javascript.vim @fleiner
579585
runtime/syntax/jinja.vim @gpanders
580586
runtime/syntax/jjdescription.vim @gpanders
587+
runtime/syntax/jq.vim @vito-c
581588
runtime/syntax/json.vim @vito-c
582589
runtime/syntax/jsonc.vim @izhakjakov
583590
runtime/syntax/julia.vim @carlobaldassi
584591
runtime/syntax/just.vim @pbnj
585-
runtime/syntax/jq.vim @vito-c
586592
runtime/syntax/karel.vim @kirillmorozov
587593
runtime/syntax/kconfig.vim @chrisbra
594+
runtime/syntax/kdl.vim @imsnif @jiangyinzuo
588595
runtime/syntax/kitty.vim @OXY2DEV
589596
runtime/syntax/kivy.vim @prophittcorey
590597
runtime/syntax/kotlin.vim @udalov
591-
runtime/syntax/kdl.vim @imsnif @jiangyinzuo
592598
runtime/syntax/krl.vim @KnoP-01
593599
runtime/syntax/leex.vim @jparise
594600
runtime/syntax/less.vim @genoma
@@ -605,8 +611,8 @@ runtime/syntax/m3quake.vim @dkearns
605611
runtime/syntax/mailcap.vim @dkearns
606612
runtime/syntax/mallard.vim @jhradilek
607613
runtime/syntax/markdown.vim @tpope
608-
runtime/syntax/mbsync.vim @fymyte
609614
runtime/syntax/mason.vim @petdance
615+
runtime/syntax/mbsync.vim @fymyte
610616
runtime/syntax/mediawiki.vim @avidseeker
611617
runtime/syntax/meson.vim @Liambeguin
612618
runtime/syntax/mf.vim @lifepillar
@@ -655,8 +661,8 @@ runtime/syntax/qml.vim @ChaseKnowlden
655661
runtime/syntax/racket.vim @benknoble
656662
runtime/syntax/raml.vim @in3d
657663
runtime/syntax/rapid.vim @KnoP-01
658-
runtime/syntax/ratpoison.vim @trapd00r
659664
runtime/syntax/rasi.vim @fymyte
665+
runtime/syntax/ratpoison.vim @trapd00r
660666
runtime/syntax/rc.vim @chrisbra
661667
runtime/syntax/rcs.vim @hdima
662668
runtime/syntax/rebol.vim @mrdubya
@@ -672,8 +678,10 @@ runtime/syntax/scala.vim @derekwyatt
672678
runtime/syntax/scheme.vim @evhan
673679
runtime/syntax/scss.vim @tpope
674680
runtime/syntax/sed.vim @dkearns
675-
runtime/syntax/shared/debversions.vim @jamessan
681+
runtime/syntax/sgf.vim @lykahb
676682
runtime/syntax/shaderslang.vim @mTvare6
683+
runtime/syntax/shared/debversions.vim @jamessan
684+
runtime/syntax/shared/hgcommitDiff.vim @vegerot
677685
runtime/syntax/skhd.vim @kiyoon
678686
runtime/syntax/solidity.vim @coti-z
679687
runtime/syntax/spajson.vim @dseomn
@@ -698,6 +706,7 @@ runtime/syntax/thrift.vim @jiangyinzuo
698706
runtime/syntax/tiasm.vim @Freed-Wu
699707
runtime/syntax/tidy.vim @dkearns
700708
runtime/syntax/tmux.vim @ericpruitt
709+
runtime/syntax/tolk.vim @redavy
701710
runtime/syntax/toml.vim @averms
702711
runtime/syntax/tt2.vim @petdance
703712
runtime/syntax/tt2html.vim @petdance

0 commit comments

Comments
 (0)