Skip to content

Commit aa9729b

Browse files
brammoolbrammool
committed
patch 8.2.4999: filetype test table is not properly sorted
Problem: Filetype test table is not properly sorted. Solution: Sort by filetype. (Doug Kearns)
1 parent bce69d6 commit aa9729b

File tree

2 files changed

+33
-30
lines changed

2 files changed

+33
-30
lines changed

‎src/testdir/test_filetype.vim‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ let s:filename_checks = {
7777
\ 'awk': ['file.awk', 'file.gawk'],
7878
\ 'b': ['file.mch', 'file.ref', 'file.imp'],
7979
\ 'basic': ['file.bas', 'file.bi', 'file.bm'],
80-
\ 'bzl': ['file.bazel', 'file.bzl', 'WORKSPACE'],
8180
\ 'bc': ['file.bc'],
8281
\ 'bdf': ['file.bdf'],
8382
\ 'beancount': ['file.beancount'],
@@ -87,6 +86,7 @@ let s:filename_checks = {
8786
\ 'blank': ['file.bl'],
8887
\ 'bsdl': ['file.bsd', 'file.bsdl', 'bsd', 'some-bsd'],
8988
\ 'bst': ['file.bst'],
89+
\ 'bzl': ['file.bazel', 'file.bzl', 'WORKSPACE'],
9090
\ 'bzr': ['bzr_log.any', 'bzr_log.file'],
9191
\ 'c': ['enlightenment/file.cfg', 'file.qc', 'file.c', 'some-enlightenment/file.cfg'],
9292
\ 'cabal': ['file.cabal'],
@@ -109,6 +109,7 @@ let s:filename_checks = {
109109
\ 'clean': ['file.dcl', 'file.icl'],
110110
\ 'clojure': ['file.clj', 'file.cljs', 'file.cljx', 'file.cljc'],
111111
\ 'cmake': ['CMakeLists.txt', 'file.cmake', 'file.cmake.in'],
112+
\ 'cmod': ['file.cmod'],
112113
\ 'cmusrc': ['any/.cmus/autosave', 'any/.cmus/rc', 'any/.cmus/command-history', 'any/.cmus/file.theme', 'any/cmus/rc', 'any/cmus/file.theme', '/.cmus/autosave', '/.cmus/command-history', '/.cmus/file.theme', '/.cmus/rc', '/cmus/file.theme', '/cmus/rc'],
113114
\ 'cobol': ['file.cbl', 'file.cob', 'file.lib'],
114115
\ 'coco': ['file.atg'],
@@ -164,9 +165,9 @@ let s:filename_checks = {
164165
\ 'dylanlid': ['file.lid'],
165166
\ 'ecd': ['file.ecd'],
166167
\ 'edif': ['file.edf', 'file.edif', 'file.edo'],
168+
\ 'eelixir': ['file.eex', 'file.leex'],
167169
\ 'elinks': ['elinks.conf'],
168170
\ 'elixir': ['file.ex', 'file.exs', 'mix.lock'],
169-
\ 'eelixir': ['file.eex', 'file.leex'],
170171
\ 'elm': ['file.elm'],
171172
\ 'elmfilt': ['filter-rules'],
172173
\ 'elvish': ['file.elv'],
@@ -199,9 +200,9 @@ let s:filename_checks = {
199200
\ 'fusion': ['file.fusion'],
200201
\ 'fvwm': ['/.fvwm/file', 'any/.fvwm/file'],
201202
\ 'gdb': ['.gdbinit', 'gdbinit', 'file.gdb', '.config/gdbearlyinit', '.gdbearlyinit'],
203+
\ 'gdmo': ['file.mo', 'file.gdmo'],
202204
\ 'gdresource': ['file.tscn', 'file.tres'],
203205
\ 'gdscript': ['file.gd'],
204-
\ 'gdmo': ['file.mo', 'file.gdmo'],
205206
\ 'gedcom': ['file.ged', 'lltxxxxx.txt', '/tmp/lltmp', '/tmp/lltmp-file', 'any/tmp/lltmp', 'any/tmp/lltmp-file'],
206207
\ 'gemtext': ['file.gmi', 'file.gemini'],
207208
\ 'gift': ['file.gift'],
@@ -237,31 +238,19 @@ let s:filename_checks = {
237238
\ 'hastepreproc': ['file.htpp'],
238239
\ 'hb': ['file.hb'],
239240
\ 'hcl': ['file.hcl'],
240-
\ 'hercules': ['file.vc', 'file.ev', 'file.sum', 'file.errsum'],
241241
\ 'heex': ['file.heex'],
242+
\ 'hercules': ['file.vc', 'file.ev', 'file.sum', 'file.errsum'],
242243
\ 'hex': ['file.hex', 'file.h32'],
243244
\ 'hgcommit': ['hg-editor-file.txt'],
244245
\ 'hjson': ['file.hjson'],
245246
\ 'hog': ['file.hog', 'snort.conf', 'vision.conf'],
246247
\ 'hollywood': ['file.hws'],
247248
\ 'hostconf': ['/etc/host.conf', 'any/etc/host.conf'],
248249
\ 'hostsaccess': ['/etc/hosts.allow', '/etc/hosts.deny', 'any/etc/hosts.allow', 'any/etc/hosts.deny'],
249-
\ 'i3config': ['/home/user/.i3/config', '/home/user/.config/i3/config', '/etc/i3/config', '/etc/xdg/i3/config'],
250-
\ 'logcheck': ['/etc/logcheck/file.d-some/file', '/etc/logcheck/file.d/file', 'any/etc/logcheck/file.d-some/file', 'any/etc/logcheck/file.d/file'],
251-
\ 'modula3': ['file.m3', 'file.mg', 'file.i3', 'file.ig'],
252-
\ 'natural': ['file.NSA', 'file.NSC', 'file.NSG', 'file.NSL', 'file.NSM', 'file.NSN', 'file.NSP', 'file.NSS'],
253-
\ 'neomuttrc': ['Neomuttrc', '.neomuttrc', '.neomuttrc-file', '/.neomutt/neomuttrc', '/.neomutt/neomuttrc-file', 'Neomuttrc', 'Neomuttrc-file', 'any/.neomutt/neomuttrc', 'any/.neomutt/neomuttrc-file', 'neomuttrc', 'neomuttrc-file'],
254-
\ 'opl': ['file.OPL', 'file.OPl', 'file.OpL', 'file.Opl', 'file.oPL', 'file.oPl', 'file.opL', 'file.opl'],
255-
\ 'pcmk': ['file.pcmk'],
256-
\ 'r': ['file.r'],
257-
\ 'rhelp': ['file.rd'],
258-
\ 'rmd': ['file.rmd', 'file.smd'],
259-
\ 'rnoweb': ['file.rnw', 'file.snw'],
260-
\ 'rrst': ['file.rrst', 'file.srst'],
261-
\ 'template': ['file.tmpl'],
262250
\ 'html': ['file.html', 'file.htm', 'file.cshtml'],
263251
\ 'htmlm4': ['file.html.m4'],
264252
\ 'httest': ['file.htt', 'file.htb'],
253+
\ 'i3config': ['/home/user/.i3/config', '/home/user/.config/i3/config', '/etc/i3/config', '/etc/xdg/i3/config'],
265254
\ 'ibasic': ['file.iba', 'file.ibi'],
266255
\ 'icemenu': ['/.icewm/menu', 'any/.icewm/menu'],
267256
\ 'icon': ['file.icn'],
@@ -314,17 +303,18 @@ let s:filename_checks = {
314303
\ 'lisp': ['file.lsp', 'file.lisp', 'file.asd', 'file.el', 'file.cl', '.emacs', '.sawfishrc', 'sbclrc', '.sbclrc'],
315304
\ 'lite': ['file.lite', 'file.lt'],
316305
\ 'litestep': ['/LiteStep/any/file.rc', 'any/LiteStep/any/file.rc'],
306+
\ 'logcheck': ['/etc/logcheck/file.d-some/file', '/etc/logcheck/file.d/file', 'any/etc/logcheck/file.d-some/file', 'any/etc/logcheck/file.d/file'],
317307
\ 'loginaccess': ['/etc/login.access', 'any/etc/login.access'],
318308
\ 'logindefs': ['/etc/login.defs', 'any/etc/login.defs'],
319309
\ 'logtalk': ['file.lgt'],
320310
\ 'lotos': ['file.lot', 'file.lotos'],
321311
\ 'lout': ['file.lou', 'file.lout'],
312+
\ 'lpc': ['file.lpc', 'file.ulpc'],
322313
\ 'lprolog': ['file.sig'],
323314
\ 'lsl': ['file.lsl'],
324315
\ 'lss': ['file.lss'],
325316
\ 'lua': ['file.lua', 'file.rockspec', 'file.nse'],
326317
\ 'lynx': ['lynx.cfg'],
327-
\ 'matlab': ['file.m'],
328318
\ 'm3build': ['m3makefile', 'm3overrides'],
329319
\ 'm3quake': ['file.quake', 'cm3.cfg'],
330320
\ 'm4': ['file.at'],
@@ -340,6 +330,7 @@ let s:filename_checks = {
340330
\ 'markdown': ['file.markdown', 'file.mdown', 'file.mkd', 'file.mkdn', 'file.mdwn', 'file.md'],
341331
\ 'mason': ['file.mason', 'file.mhtml', 'file.comp'],
342332
\ 'master': ['file.mas', 'file.master'],
333+
\ 'matlab': ['file.m'],
343334
\ 'maxima': ['file.demo', 'file.dmt', 'file.dm1', 'file.dm2', 'file.dm3',
344335
\ 'file.wxm', 'maxima-init.mac'],
345336
\ 'mel': ['file.mel'],
@@ -360,6 +351,7 @@ let s:filename_checks = {
360351
\ 'mmp': ['file.mmp'],
361352
\ 'modconf': ['/etc/modules.conf', '/etc/modules', '/etc/conf.modules', '/etc/modprobe.file', 'any/etc/conf.modules', 'any/etc/modprobe.file', 'any/etc/modules', 'any/etc/modules.conf'],
362353
\ 'modula2': ['file.m2', 'file.mi'],
354+
\ 'modula3': ['file.m3', 'file.mg', 'file.i3', 'file.ig'],
363355
\ 'monk': ['file.isc', 'file.monk', 'file.ssc', 'file.tsc'],
364356
\ 'moo': ['file.moo'],
365357
\ 'mp': ['file.mp'],
@@ -374,7 +366,9 @@ let s:filename_checks = {
374366
\ 'n1ql': ['file.n1ql', 'file.nql'],
375367
\ 'named': ['namedfile.conf', 'rndcfile.conf', 'named-file.conf', 'named.conf', 'rndc-file.conf', 'rndc-file.key', 'rndc.conf', 'rndc.key'],
376368
\ 'nanorc': ['/etc/nanorc', 'file.nanorc', 'any/etc/nanorc'],
369+
\ 'natural': ['file.NSA', 'file.NSC', 'file.NSG', 'file.NSL', 'file.NSM', 'file.NSN', 'file.NSP', 'file.NSS'],
377370
\ 'ncf': ['file.ncf'],
371+
\ 'neomuttrc': ['Neomuttrc', '.neomuttrc', '.neomuttrc-file', '/.neomutt/neomuttrc', '/.neomutt/neomuttrc-file', 'Neomuttrc', 'Neomuttrc-file', 'any/.neomutt/neomuttrc', 'any/.neomutt/neomuttrc-file', 'neomuttrc', 'neomuttrc-file'],
378372
\ 'netrc': ['.netrc'],
379373
\ 'nginx': ['file.nginx', 'nginxfile.conf', 'filenginx.conf', 'any/etc/nginx/file', 'any/usr/local/nginx/conf/file', 'any/nginx/file.conf'],
380374
\ 'ninja': ['file.ninja'],
@@ -390,6 +384,7 @@ let s:filename_checks = {
390384
\ 'opam': ['opam', 'file.opam', 'file.opam.template'],
391385
\ 'openroad': ['file.or'],
392386
\ 'openscad': ['file.scad'],
387+
\ 'opl': ['file.OPL', 'file.OPl', 'file.OpL', 'file.Opl', 'file.oPL', 'file.oPl', 'file.opL', 'file.opl'],
393388
\ 'ora': ['file.ora'],
394389
\ 'org': ['file.org', 'file.org_archive'],
395390
\ 'pamconf': ['/etc/pam.conf', '/etc/pam.d/file', 'any/etc/pam.conf', 'any/etc/pam.d/file'],
@@ -399,14 +394,13 @@ let s:filename_checks = {
399394
\ 'passwd': ['any/etc/passwd', 'any/etc/passwd-', 'any/etc/passwd.edit', 'any/etc/shadow', 'any/etc/shadow-', 'any/etc/shadow.edit', 'any/var/backups/passwd.bak', 'any/var/backups/shadow.bak', '/etc/passwd', '/etc/passwd-', '/etc/passwd.edit', '/etc/shadow', '/etc/shadow-', '/etc/shadow.edit', '/var/backups/passwd.bak', '/var/backups/shadow.bak'],
400395
\ 'pbtxt': ['file.pbtxt'],
401396
\ 'pccts': ['file.g'],
397+
\ 'pcmk': ['file.pcmk'],
402398
\ 'pdf': ['file.pdf'],
403399
\ 'perl': ['file.plx', 'file.al', 'file.psgi', 'gitolite.rc', '.gitolite.rc', 'example.gitolite.rc'],
404400
\ 'pf': ['pf.conf'],
405401
\ 'pfmain': ['main.cf'],
406402
\ 'php': ['file.php', 'file.php9', 'file.phtml', 'file.ctp', 'file.phpt'],
407-
\ 'lpc': ['file.lpc', 'file.ulpc'],
408403
\ 'pike': ['file.pike', 'file.pmod'],
409-
\ 'cmod': ['file.cmod'],
410404
\ 'pilrc': ['file.rcp'],
411405
\ 'pine': ['.pinerc', 'pinerc', '.pinercex', 'pinercex'],
412406
\ 'pinfo': ['/etc/pinforc', '/.pinforc', 'any/.pinforc', 'any/etc/pinforc'],
@@ -422,8 +416,8 @@ let s:filename_checks = {
422416
\ 'povini': ['.povrayrc'],
423417
\ 'ppd': ['file.ppd'],
424418
\ 'ppwiz': ['file.it', 'file.ih'],
425-
\ 'privoxy': ['file.action'],
426419
\ 'prisma': ['file.prisma'],
420+
\ 'privoxy': ['file.action'],
427421
\ 'proc': ['file.pc'],
428422
\ 'procmail': ['.procmail', '.procmailrc'],
429423
\ 'prolog': ['file.pdb'],
@@ -441,27 +435,33 @@ let s:filename_checks = {
441435
\ 'python': ['file.py', 'file.pyw', '.pythonstartup', '.pythonrc', 'file.ptl', 'file.pyi', 'SConstruct'],
442436
\ 'ql': ['file.ql', 'file.qll'],
443437
\ 'quake': ['anybaseq2/file.cfg', 'anyid1/file.cfg', 'quake3/file.cfg', 'baseq2/file.cfg', 'id1/file.cfg', 'quake1/file.cfg', 'some-baseq2/file.cfg', 'some-id1/file.cfg', 'some-quake1/file.cfg'],
438+
\ 'r': ['file.r'],
444439
\ 'radiance': ['file.rad', 'file.mat'],
445440
\ 'raku': ['file.pm6', 'file.p6', 'file.t6', 'file.pod6', 'file.raku', 'file.rakumod', 'file.rakudoc', 'file.rakutest'],
441+
\ 'raml': ['file.raml'],
446442
\ 'ratpoison': ['.ratpoisonrc', 'ratpoisonrc'],
447443
\ 'rbs': ['file.rbs'],
448444
\ 'rc': ['file.rc', 'file.rch'],
449445
\ 'rcs': ['file,v'],
450446
\ 'readline': ['.inputrc', 'inputrc'],
451-
\ 'remind': ['.reminders', 'file.remind', 'file.rem', '.reminders-file'],
452447
\ 'rego': ['file.rego'],
448+
\ 'remind': ['.reminders', 'file.remind', 'file.rem', '.reminders-file'],
453449
\ 'rescript': ['file.res', 'file.resi'],
454450
\ 'resolv': ['resolv.conf'],
455451
\ 'reva': ['file.frt'],
456452
\ 'rexx': ['file.rex', 'file.orx', 'file.rxo', 'file.rxj', 'file.jrexx', 'file.rexxj', 'file.rexx', 'file.testGroup', 'file.testUnit'],
453+
\ 'rhelp': ['file.rd'],
457454
\ 'rib': ['file.rib'],
455+
\ 'rmd': ['file.rmd', 'file.smd'],
458456
\ 'rnc': ['file.rnc'],
459457
\ 'rng': ['file.rng'],
458+
\ 'rnoweb': ['file.rnw', 'file.snw'],
460459
\ 'robot': ['file.robot', 'file.resource'],
461460
\ 'robots': ['robots.txt'],
462461
\ 'routeros': ['file.rsc'],
463462
\ 'rpcgen': ['file.x'],
464463
\ 'rpl': ['file.rpl'],
464+
\ 'rrst': ['file.rrst', 'file.srst'],
465465
\ 'rst': ['file.rst'],
466466
\ 'rtf': ['file.rtf'],
467467
\ 'ruby': ['.irbrc', 'irbrc', 'file.rb', 'file.rbw', 'file.gemspec', 'file.ru', 'Gemfile', 'file.builder', 'file.rxml', 'file.rjs', 'file.rant', 'file.rake', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file', 'Puppetfile', 'Vagrantfile'],
@@ -475,26 +475,24 @@ let s:filename_checks = {
475475
\ 'scheme': ['file.scm', 'file.ss', 'file.sld', 'file.rkt', 'file.rktd', 'file.rktl'],
476476
\ 'scilab': ['file.sci', 'file.sce'],
477477
\ 'screen': ['.screenrc', 'screenrc'],
478-
\ 'sexplib': ['file.sexp'],
479478
\ 'scss': ['file.scss'],
480479
\ 'sd': ['file.sd'],
481480
\ 'sdc': ['file.sdc'],
482481
\ 'sdl': ['file.sdl', 'file.pr'],
483482
\ 'sed': ['file.sed'],
484-
\ 'svelte': ['file.svelte'],
485483
\ 'sensors': ['/etc/sensors.conf', '/etc/sensors3.conf', '/etc/sensors.d/file', 'any/etc/sensors.conf', 'any/etc/sensors3.conf', 'any/etc/sensors.d/file'],
486484
\ 'services': ['/etc/services', 'any/etc/services'],
487485
\ 'setserial': ['/etc/serial.conf', 'any/etc/serial.conf'],
486+
\ 'sexplib': ['file.sexp'],
488487
\ 'sh': ['.bashrc', 'file.bash', '/usr/share/doc/bash-completion/filter.sh','/etc/udev/cdsymlinks.conf', 'any/etc/udev/cdsymlinks.conf'],
489488
\ 'sieve': ['file.siv', 'file.sieve'],
489+
\ 'sil': ['file.sil'],
490490
\ 'simula': ['file.sim'],
491491
\ 'sinda': ['file.sin', 'file.s85'],
492492
\ 'sisu': ['file.sst', 'file.ssm', 'file.ssi', 'file.-sst', 'file._sst', 'file.sst.meta', 'file.-sst.meta', 'file._sst.meta'],
493493
\ 'skill': ['file.il', 'file.ils', 'file.cdf'],
494494
\ 'slang': ['file.sl'],
495495
\ 'slice': ['file.ice'],
496-
\ 'solidity': ['file.sol'],
497-
\ 'solution': ['file.sln'],
498496
\ 'slpconf': ['/etc/slp.conf', 'any/etc/slp.conf'],
499497
\ 'slpreg': ['/etc/slp.reg', 'any/etc/slp.reg'],
500498
\ 'slpspi': ['/etc/slp.spi', 'any/etc/slp.spi'],
@@ -506,6 +504,8 @@ let s:filename_checks = {
506504
\ 'smith': ['file.smt', 'file.smith'],
507505
\ 'sml': ['file.sml'],
508506
\ 'snobol4': ['file.sno', 'file.spt'],
507+
\ 'solidity': ['file.sol'],
508+
\ 'solution': ['file.sln'],
509509
\ 'sparql': ['file.rq', 'file.sparql'],
510510
\ 'spec': ['file.spec'],
511511
\ 'spice': ['file.sp', 'file.spice'],
@@ -525,11 +525,11 @@ let s:filename_checks = {
525525
\ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers', 'any/etc/sudoers.d/file'],
526526
\ 'supercollider': ['file.quark'],
527527
\ 'surface': ['file.sface'],
528+
\ 'svelte': ['file.svelte'],
528529
\ 'svg': ['file.svg'],
529530
\ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'],
530531
\ 'swift': ['file.swift'],
531532
\ 'swiftgyb': ['file.swift.gyb'],
532-
\ 'sil': ['file.sil'],
533533
\ 'sysctl': ['/etc/sysctl.conf', '/etc/sysctl.d/file.conf', 'any/etc/sysctl.conf', 'any/etc/sysctl.d/file.conf'],
534534
\ 'systemd': ['any/systemd/file.automount', 'any/systemd/file.dnssd', 'any/systemd/file.link', 'any/systemd/file.mount', 'any/systemd/file.netdev', 'any/systemd/file.network', 'any/systemd/file.nspawn', 'any/systemd/file.path', 'any/systemd/file.service', 'any/systemd/file.slice', 'any/systemd/file.socket', 'any/systemd/file.swap', 'any/systemd/file.target', 'any/systemd/file.timer', '/etc/systemd/some.conf.d/file.conf', '/etc/systemd/system/some.d/file.conf', '/etc/systemd/system/some.d/.#file', '/etc/systemd/system/.#otherfile', '/home/user/.config/systemd/user/some.d/mine.conf', '/home/user/.config/systemd/user/some.d/.#file', '/home/user/.config/systemd/user/.#otherfile', '/.config/systemd/user/.#', '/.config/systemd/user/.#-file', '/.config/systemd/user/file.d/.#', '/.config/systemd/user/file.d/.#-file', '/.config/systemd/user/file.d/file.conf', '/etc/systemd/file.conf.d/file.conf', '/etc/systemd/system/.#', '/etc/systemd/system/.#-file', '/etc/systemd/system/file.d/.#', '/etc/systemd/system/file.d/.#-file', '/etc/systemd/system/file.d/file.conf', '/systemd/file.automount', '/systemd/file.dnssd', '/systemd/file.link', '/systemd/file.mount', '/systemd/file.netdev', '/systemd/file.network', '/systemd/file.nspawn', '/systemd/file.path', '/systemd/file.service', '/systemd/file.slice', '/systemd/file.socket', '/systemd/file.swap', '/systemd/file.target', '/systemd/file.timer', 'any/.config/systemd/user/.#', 'any/.config/systemd/user/.#-file', 'any/.config/systemd/user/file.d/.#', 'any/.config/systemd/user/file.d/.#-file', 'any/.config/systemd/user/file.d/file.conf', 'any/etc/systemd/file.conf.d/file.conf', 'any/etc/systemd/system/.#', 'any/etc/systemd/system/.#-file', 'any/etc/systemd/system/file.d/.#', 'any/etc/systemd/system/file.d/.#-file', 'any/etc/systemd/system/file.d/file.conf'],
535535
\ 'systemverilog': ['file.sv', 'file.svh'],
@@ -539,6 +539,7 @@ let s:filename_checks = {
539539
\ 'taskedit': ['file.task'],
540540
\ 'tcl': ['file.tcl', 'file.tm', 'file.tk', 'file.itcl', 'file.itk', 'file.jacl', '.tclshrc', 'tclsh.rc', '.wishrc'],
541541
\ 'teal': ['file.tl'],
542+
\ 'template': ['file.tmpl'],
542543
\ 'teraterm': ['file.ttl'],
543544
\ 'terminfo': ['file.ti'],
544545
\ 'terraform': ['file.tfvars'],
@@ -575,8 +576,8 @@ let s:filename_checks = {
575576
\ 'upstreamlog': ['fdrupstream.log', 'upstream.log', 'UPSTREAM.LOG', 'upstream.file.log', 'UPSTREAM.FILE.LOG', 'file.upstream.log', 'FILE.UPSTREAM.LOG', 'UPSTREAM-file.log', 'UPSTREAM-FILE.LOG'],
576577
\ 'usserverlog': ['usserver.log', 'USSERVER.LOG', 'usserver.file.log', 'USSERVER.FILE.LOG', 'file.usserver.log', 'FILE.USSERVER.LOG'],
577578
\ 'usw2kagtlog': ['usw2kagt.log', 'USW2KAGT.LOG', 'usw2kagt.file.log', 'USW2KAGT.FILE.LOG', 'file.usw2kagt.log', 'FILE.USW2KAGT.LOG'],
578-
\ 'vb': ['file.sba', 'file.vb', 'file.vbs', 'file.dsm', 'file.ctl'],
579579
\ 'vala': ['file.vala'],
580+
\ 'vb': ['file.sba', 'file.vb', 'file.vbs', 'file.dsm', 'file.ctl'],
580581
\ 'vera': ['file.vr', 'file.vri', 'file.vrh'],
581582
\ 'verilog': ['file.v'],
582583
\ 'verilogams': ['file.va', 'file.vams'],
@@ -599,12 +600,12 @@ let s:filename_checks = {
599600
\ 'wsml': ['file.wsml'],
600601
\ 'wvdial': ['wvdial.conf', '.wvdialrc'],
601602
\ 'xdefaults': ['.Xdefaults', '.Xpdefaults', '.Xresources', 'xdm-config', 'file.ad', '/Xresources/file', '/app-defaults/file', 'Xresources', 'Xresources-file', 'any/Xresources/file', 'any/app-defaults/file'],
603+
\ 'xf86conf': ['xorg.conf', 'xorg.conf-4'],
602604
\ 'xhtml': ['file.xhtml', 'file.xht'],
603605
\ 'xinetd': ['/etc/xinetd.conf', '/etc/xinetd.d/file', 'any/etc/xinetd.conf', 'any/etc/xinetd.d/file'],
604606
\ 'xmath': ['file.msc', 'file.msf'],
605607
\ 'xml': ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj', 'file.csproj.user', 'file.fsproj', 'file.fsproj.user', 'file.vbproj', 'file.vbproj.user', 'file.ui', 'file.tpm', '/etc/xdg/menus/file.menu', 'fglrxrc', 'file.xlf', 'file.xliff', 'file.xul', 'file.wsdl', 'file.wpl', 'any/etc/blkid.tab', 'any/etc/blkid.tab.old', 'any/etc/xdg/menus/file.menu', 'file.atom', 'file.rss', 'file.cdxml', 'file.psc1', 'file.mpd'],
606608
\ 'xmodmap': ['anyXmodmap', 'Xmodmap', 'some-Xmodmap', 'some-xmodmap', 'some-xmodmap-file', 'xmodmap', 'xmodmap-file'],
607-
\ 'xf86conf': ['xorg.conf', 'xorg.conf-4'],
608609
\ 'xpm': ['file.xpm'],
609610
\ 'xpm2': ['file.xpm2'],
610611
\ 'xquery': ['file.xq', 'file.xql', 'file.xqm', 'file.xquery', 'file.xqy'],
@@ -614,7 +615,6 @@ let s:filename_checks = {
614615
\ 'yacc': ['file.yy', 'file.yxx', 'file.y++'],
615616
\ 'yaml': ['file.yaml', 'file.yml'],
616617
\ 'yang': ['file.yang'],
617-
\ 'raml': ['file.raml'],
618618
\ 'z8a': ['file.z8a'],
619619
\ 'zig': ['file.zig'],
620620
\ 'zimbu': ['file.zu'],
@@ -868,6 +868,7 @@ func Test_cfg_file()
868868
let ext = substitute(ext, '\(\l\)', '\u\1', '')
869869
endfor
870870

871+
" clean up
871872
filetype off
872873
endfunc
873874

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,8 @@ static char *(features[]) =
734734

735735
static int included_patches[] =
736736
{ /* Add new patch number below this line */
737+
/**/
738+
4999,
737739
/**/
738740
4998,
739741
/**/

0 commit comments

Comments
 (0)