Skip to content

Commit de3b365

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 8f19e6e + ae7e61c commit de3b365

File tree

816 files changed

+31739
-5711
lines changed

Some content is hidden

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

816 files changed

+31739
-5711
lines changed

.github/CODEOWNERS_vim

Lines changed: 14 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,15 @@
99
# So if a pull request only touches javascript files, only these owners
1010
# will be requested to review.
1111

12+
nsis/lang/russian.nsi @RestorerZ
1213
runtime/autoload/freebasic.vim @dkearns
13-
runtime/autoload/getscript.vim @cecamp
1414
runtime/autoload/haskell.vim @alx741
1515
runtime/autoload/javascript.vim @jsit
1616
runtime/autoload/modula2.vim @dkearns
17-
runtime/autoload/netrw.vim @cecamp
18-
runtime/autoload/netrwFileHandlers.vim @cecamp
19-
runtime/autoload/netrwSettings.vim @cecamp
2017
runtime/autoload/php.vim @david-szabo97
2118
runtime/autoload/rubycomplete.vim @segfault @dkearns
2219
runtime/autoload/rust.vim @lilyball
23-
runtime/autoload/tar.vim @cecamp
24-
runtime/autoload/vimball.vim @cecamp
2520
runtime/autoload/xmlformat.vim @chrisbra
26-
runtime/autoload/zip.vim @cecamp
2721
runtime/autoload/dist/json.vim @habamax
2822
runtime/colors/blue.vim @habamax @romainl @neutaaaaan
2923
runtime/colors/darkblue.vim @habamax @romainl @neutaaaaan
@@ -108,12 +102,6 @@ runtime/compiler/xmllint.vim @dkearns
108102
runtime/compiler/xo.vim @dkearns
109103
runtime/compiler/yamllint.vim @romainl
110104
runtime/compiler/zsh.vim @dkearns
111-
runtime/doc/pi_getscript.txt @cecamp
112-
runtime/doc/pi_logipat.txt @cecamp
113-
runtime/doc/pi_netrw.txt @cecamp
114-
runtime/doc/pi_tar.txt @cecamp
115-
runtime/doc/pi_vimball.txt @cecamp
116-
runtime/doc/pi_zip.txt @cecamp
117105
runtime/doc/ps1.txt @heaths
118106
runtime/ftplugin/abaqus.vim @costerwi
119107
runtime/ftplugin/apache.vim @dubgeiser
@@ -127,6 +115,7 @@ runtime/ftplugin/cs.vim @nickspoons
127115
runtime/ftplugin/csh.vim @dkearns
128116
runtime/ftplugin/css.vim @dkearns
129117
runtime/ftplugin/cucumber.vim @tpope
118+
runtime/ftplugin/deb822sources.vim @jamessan
130119
runtime/ftplugin/debchangelog.vim @jamessan
131120
runtime/ftplugin/debcontrol.vim @jamessan
132121
runtime/ftplugin/debsources.vim @jamessan
@@ -167,6 +156,7 @@ runtime/ftplugin/icon.vim @dkearns
167156
runtime/ftplugin/indent.vim @dkearns
168157
runtime/ftplugin/ishd.vim @dkearns
169158
runtime/ftplugin/j.vim @glts
159+
runtime/ftplugin/java.vim @zzzyxwvut
170160
runtime/ftplugin/javascript.vim @dkearns
171161
runtime/ftplugin/javascriptreact.vim @dkearns
172162
runtime/ftplugin/json.vim @dbarnett
@@ -182,7 +172,6 @@ runtime/ftplugin/lynx.vim @dkearns
182172
runtime/ftplugin/m3build.vim @dkearns
183173
runtime/ftplugin/m3quake.vim @dkearns
184174
runtime/ftplugin/markdown.vim @tpope
185-
runtime/ftplugin/matlab.vim @cecamp
186175
runtime/ftplugin/meson.vim @Liambeguin
187176
runtime/ftplugin/modula2.vim @dkearns
188177
runtime/ftplugin/modula3.vim @dkearns
@@ -205,14 +194,9 @@ runtime/ftplugin/pymanifest.vim @ObserverOfTime
205194
runtime/ftplugin/python.vim @tpict
206195
runtime/ftplugin/qb64.vim @dkearns
207196
runtime/ftplugin/qml.vim @ChaseKnowlden
208-
runtime/ftplugin/r.vim @jalvesaq
209197
runtime/ftplugin/racket.vim @benknoble
210198
runtime/ftplugin/readline.vim @dkearns
211-
runtime/ftplugin/rhelp.vim @jalvesaq
212-
runtime/ftplugin/rmd.vim @jalvesaq
213-
runtime/ftplugin/rnoweb.vim @jalvesaq
214199
runtime/ftplugin/routeros.vim @zainin
215-
runtime/ftplugin/rrst.vim @jalvesaq
216200
runtime/ftplugin/rst.vim @marshallward
217201
runtime/ftplugin/ruby.vim @tpope @dkearns
218202
runtime/ftplugin/rust.vim @lilyball
@@ -239,6 +223,7 @@ runtime/ftplugin/typescript.vim @dkearns
239223
runtime/ftplugin/typescriptreact.vim @dkearns
240224
runtime/ftplugin/unison.vim @chuwy
241225
runtime/ftplugin/vdf.vim @ObserverOfTime
226+
runtime/ftplugin/vim.vim @dkearns
242227
runtime/ftplugin/wast.vim @rhysd
243228
runtime/ftplugin/wget.vim @dkearns
244229
runtime/ftplugin/wget2.vim @dkearns
@@ -302,14 +287,9 @@ runtime/indent/prolog.vim @dkearns
302287
runtime/indent/ps1.vim @heaths
303288
runtime/indent/qb64.vim @dkearns
304289
runtime/indent/qml.vim @ChaseKnowlden
305-
runtime/indent/r.vim @jalvesaq
306290
runtime/indent/racket.vim @benknoble
307291
runtime/indent/rapid.vim @KnoP-01
308292
runtime/indent/readline.vim @dkearns
309-
runtime/indent/rhelp.vim @jalvesaq
310-
runtime/indent/rmd.vim @jalvesaq
311-
runtime/indent/rnoweb.vim @jalvesaq
312-
runtime/indent/rrst.vim @jalvesaq
313293
runtime/indent/ruby.vim @AndrewRadev @dkearns
314294
runtime/indent/sass.vim @tpope
315295
runtime/indent/scala.vim @derekwyatt
@@ -327,21 +307,18 @@ runtime/indent/xml.vim @chrisbra
327307
runtime/indent/zsh.vim @chrisbra
328308
runtime/keymap/armenian-eastern_utf-8.vim @blinskey
329309
runtime/keymap/armenian-western_utf-8.vim @blinskey
310+
runtime/keymap/russian-typograph.vim @RestorerZ
330311
runtime/keymap/tamil_tscii.vim @yegappan
331312
runtime/lang/menu_en_gb.latin1.vim @mrdubya
313+
runtime/lang/menu_ru_ru.cp1251.vim @RestorerZ
314+
runtime/lang/menu_ru_ru.koi8-r.vim @RestorerZ
315+
runtime/lang/menu_ru_ru.utf-8.vim @RestorerZ
332316
runtime/pack/dist/opt/cfilter/plugin/cfilter.vim @yegappan
333317
runtime/pack/dist/opt/matchit/ @chrisbra
334-
runtime/plugin/getscriptPlugin.vim @cecamp
335-
runtime/plugin/logiPat.vim @cecamp
336-
runtime/plugin/netrwPlugin.vim @cecamp
337-
runtime/plugin/tarPlugin.vim @cecamp
338-
runtime/plugin/vimballPlugin.vim @cecamp
339-
runtime/plugin/zipPlugin.vim @cecamp
340318
runtime/plugin/manpager.vim @Konfekt
341319
runtime/syntax/shared/hgcommitDiff.vim @vegerot
342320
runtime/syntax/abaqus.vim @costerwi
343321
runtime/syntax/aidl.vim @dpelle
344-
runtime/syntax/amiga.vim @cecamp
345322
runtime/syntax/ant.vim @dkearns
346323
runtime/syntax/arduino.vim @johshoff
347324
runtime/syntax/asciidoc.vim @aerostitch
@@ -362,12 +339,10 @@ runtime/syntax/chatito.vim @ObserverOfTime
362339
runtime/syntax/chuck.vim @gacallea
363340
runtime/syntax/clojure.vim @axvr
364341
runtime/syntax/cs.vim @nickspoons
365-
runtime/syntax/csh.vim @cecamp
366342
runtime/syntax/cucumber.vim @tpope
367343
runtime/syntax/d.vim @JesseKPhillips
368344
runtime/syntax/dart.vim @pr3d4t0r
369345
runtime/syntax/datascript.vim @dpelle
370-
runtime/syntax/dcl.vim @cecamp
371346
runtime/syntax/deb822sources.vim @jamessan
372347
runtime/syntax/debchangelog.vim @jamessan
373348
runtime/syntax/debcontrol.vim @jamessan
@@ -383,11 +358,9 @@ runtime/syntax/dtd.vim @chrisbra
383358
runtime/syntax/dts.vim @zonque
384359
runtime/syntax/editorconfig.vim @gpanders
385360
runtime/syntax/eiffel.vim @jocelyn
386-
runtime/syntax/elmfilt.vim @cecamp
387361
runtime/syntax/erlang.vim @hcs42
388362
runtime/syntax/eruby.vim @tpope @dkearns
389363
runtime/syntax/expect.vim @dkearns
390-
runtime/syntax/exports.vim @cecamp
391364
runtime/syntax/falcon.vim @steveno
392365
runtime/syntax/fennel.vim @gpanders
393366
runtime/syntax/fetchmail.vim @dkearns
@@ -414,6 +387,7 @@ runtime/syntax/gyp.vim @ObserverOfTime
414387
runtime/syntax/haml.vim @tpope
415388
runtime/syntax/hare.vim @rsaihe
416389
runtime/syntax/haskell.vim @coot
390+
runtime/syntax/help_ru.vim @RestorerZ
417391
runtime/syntax/hgcommit.vim @k-takata
418392
runtime/syntax/hitest.vim @lacygoill
419393
runtime/syntax/hog.vim @wtfbbqhax
@@ -424,17 +398,15 @@ runtime/syntax/icon.vim @dkearns
424398
runtime/syntax/indent.vim @dkearns
425399
runtime/syntax/j.vim @glts
426400
runtime/syntax/jargon.vim @h3xx
427-
runtime/syntax/java.vim @fleiner
401+
runtime/syntax/java.vim @zzzyxwvut
428402
runtime/syntax/javascript.vim @fleiner
429403
runtime/syntax/jsonc.vim @izhakjakov
430404
runtime/syntax/julia.vim @carlobaldassi
431405
runtime/syntax/kconfig.vim @chrisbra
432406
runtime/syntax/kotlin.vim @udalov
433407
runtime/syntax/krl.vim @KnoP-01
434408
runtime/syntax/less.vim @genoma
435-
runtime/syntax/lex.vim @cecamp
436409
runtime/syntax/liquid.vim @tpope
437-
runtime/syntax/lisp.vim @cecamp
438410
runtime/syntax/lua.vim @marcuscf
439411
runtime/syntax/lyrics.vim @ObserverOfTime
440412
runtime/syntax/lynx.vim @dkearns
@@ -443,7 +415,6 @@ runtime/syntax/m3quake.vim @dkearns
443415
runtime/syntax/mailcap.vim @dkearns
444416
runtime/syntax/make.vim @rohieb
445417
runtime/syntax/mallard.vim @jhradilek
446-
runtime/syntax/maple.vim @cecamp
447418
runtime/syntax/markdown.vim @tpope
448419
runtime/syntax/mason.vim @petdance
449420
runtime/syntax/meson.vim @Liambeguin
@@ -453,7 +424,6 @@ runtime/syntax/modula2/opt/pim.vim @trijezdci
453424
runtime/syntax/modula2/opt/r10.vim @trijezdci
454425
runtime/syntax/modula3.vim @dkearns
455426
runtime/syntax/n1ql.vim @pr3d4t0r
456-
runtime/syntax/netrw.vim @cecamp
457427
runtime/syntax/nginx.vim @chr4
458428
runtime/syntax/ninja.vim @nico
459429
runtime/syntax/nix.vim @equill
@@ -478,7 +448,6 @@ runtime/syntax/psl.vim @danielkho
478448
runtime/syntax/pymanifest.vim @ObserverOfTime
479449
runtime/syntax/qb64.vim @dkearns
480450
runtime/syntax/qml.vim @ChaseKnowlden
481-
runtime/syntax/r.vim @jalvesaq
482451
runtime/syntax/racket.vim @benknoble
483452
runtime/syntax/raml.vim @in3d
484453
runtime/syntax/rapid.vim @KnoP-01
@@ -488,21 +457,16 @@ runtime/syntax/rcs.vim @hdima
488457
runtime/syntax/rebol.vim @mrdubya
489458
runtime/syntax/rego.vim @zenmatic
490459
runtime/syntax/resolv.vim @rid9
491-
runtime/syntax/rmd.vim @jalvesaq
492460
runtime/syntax/rng.vim @jhradilek
493461
runtime/syntax/routeros.vim @zainin
494-
runtime/syntax/rpcgen.vim @cecamp
495-
runtime/syntax/rrst.vim @jalvesaq
496462
runtime/syntax/rst.vim @marshallward
497463
runtime/syntax/ruby.vim @dkearns
498464
runtime/syntax/sass.vim @tpope
499465
runtime/syntax/scala.vim @derekwyatt
500466
runtime/syntax/scss.vim @tpope
501467
runtime/syntax/sdoc.vim @gpanders
502468
runtime/syntax/sed.vim @dkearns
503-
runtime/syntax/sh.vim @cecamp
504469
runtime/syntax/shared/debversions.vim @jamessan
505-
runtime/syntax/sm.vim @cecamp
506470
runtime/syntax/solidity.vim @cothi
507471
runtime/syntax/spec.vim @ignatenkobrain
508472
runtime/syntax/sqloracle.vim @chrisbra
@@ -516,11 +480,9 @@ runtime/syntax/svn.vim @hdima
516480
runtime/syntax/swayconfig.vim @jamespeapen
517481
runtime/syntax/swig.vim @jmarrec
518482
runtime/syntax/systemverilog.vim @Kocha
519-
runtime/syntax/tags.vim @cecamp
520483
runtime/syntax/tap.vim @petdance
521484
runtime/syntax/tcsh.vim @dkearns
522485
runtime/syntax/teraterm.vim @k-takata
523-
runtime/syntax/tex.vim @cecamp
524486
runtime/syntax/tidy.vim @dkearns
525487
runtime/syntax/tmux.vim @ericpruitt
526488
runtime/syntax/toml.vim @averms
@@ -532,26 +494,25 @@ runtime/syntax/typescriptcommon.vim @HerringtonDarkholme
532494
runtime/syntax/typescriptreact.vim @HerringtonDarkholme
533495
runtime/syntax/unison.vim @chuwy
534496
runtime/syntax/vdf.vim @ObserverOfTime
535-
runtime/syntax/vim.vim @cecamp
536497
runtime/syntax/vroom.vim @dbarnett
537498
runtime/syntax/wast.vim @rhysd
538499
runtime/syntax/wdl.vim @zenmatic
539500
runtime/syntax/wget.vim @dkearns
540501
runtime/syntax/wget2.vim @dkearns
541502
runtime/syntax/xbl.vim @dkearns
542503
runtime/syntax/xcompose.vim @ObserverOfTime
543-
runtime/syntax/xmath.vim @cecamp
544504
runtime/syntax/xml.vim @chrisbra
545505
runtime/syntax/xs.vim @petdance
546506
runtime/syntax/xslt.vim @Boobies
547-
runtime/syntax/xxd.vim @cecamp
548-
runtime/syntax/yacc.vim @cecamp
549507
runtime/syntax/zserio.vim @dpelle
550508
runtime/syntax/zsh.vim @chrisbra
551509
runtime/tutor/tutor.eo @dpelle
552510
runtime/tutor/tutor.eo.utf-8 @dpelle
553511
runtime/tutor/tutor.fr @dpelle
554512
runtime/tutor/tutor.fr.utf-8 @dpelle
513+
runtime/tutor/tutor.ru @RestorerZ
514+
runtime/tutor/tutor.ru.cp1251 @RestorerZ
515+
runtime/tutor/tutor.ru.utf-8 @RestorerZ
555516
src/iscygpty.* @k-takata
556517
src/libvterm/ @leonerd
557518
src/po/ca.po @nfdisco
@@ -563,6 +524,7 @@ src/po/fr.po @dpelle
563524
src/po/ga.po @kscanne
564525
src/po/it.po @azc100
565526
src/po/ja.po @k-takata
527+
src/po/ru.po @RestorerZ
566528
src/po/sr.po @eevan78
567529
src/po/tr.po @bitigchi
568530
src/po/uk.po @sakhnik

.github/workflows/ci-macvim.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,17 @@ jobs:
129129
run: |
130130
brew install libtool
131131
132+
- name: Install packages for testing
133+
run: |
134+
# Apple diff is broken. Use GNU diff instead. See http://github.com/vim/vim/issues/14056.
135+
brew install diffutils
136+
137+
- name: Grant microphone access for macos-14
138+
if: matrix.os == 'macos-14'
139+
run: |
140+
# Temporary fix to fix microphone permission issues for macos-14 when playing sound.
141+
sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR IGNORE INTO access VALUES ('kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159,NULL,NULL,'UNUSED',1687786159);"
142+
132143
- name: Install scripting runtimes
133144
if: matrix.publish
134145
run: |

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,12 @@ src/a.out.dSYM
148148

149149
# Generated by "make install"
150150
runtime/doc/doctags
151+
runtime/doc/tags-*
152+
153+
# Temporarily generated by "runtime/syntax/generator/make"
154+
runtime/syntax/generator/generator.err
155+
runtime/syntax/generator/sanity_check.err
156+
runtime/syntax/generator/vim.vim.rc
151157

152158
# Generated by "make shadow". The directory names could be anything but we
153159
# restrict them to shadow (the default) or shadow-*

.hgignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ src/kword_test
9898

9999
# Generated by "make install"
100100
runtime/doc/doctags
101+
runtime/doc/tags-*
101102

102103
# Generated by "make shadow". The directory names could be anything but we
103104
# restrict them to shadow (the default) or shadow-*

0 commit comments

Comments
 (0)